Mercurial > mxe-octave

annotate src/of-io-1-fixes.patch @ 4245:e622765c49c7 octave-release-4.2.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update stable-octave package for 4.2.0 release. * src/stable-octave.mk: Update for 4.2.0 release. * src/stable-octave-1-gnulib.patch: New file. * src/stable-octave-1-docinstall.patch: Delete. * src/stable-octave-1-fixes.patch: Delete. * src/of-io-1-fixes.patch: New file.
author John W. Eaton <jwe@octave.org>
date Sun, 13 Nov 2016 12:47:40 -0500
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4245
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -ur io-2.4.5.orig/inst/private/__OCT_xlsx2oct__.m io-2.4.5/inst/private/__OCT_xlsx2oct__.m
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- orig/inst/private/__OCT_xlsx2oct__.m 2016-11-08 22:05:13.000000000 +0100
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ src/inst/private/__OCT_xlsx2oct__.m 2016-11-12 21:43:52.076390219 +0100
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -196,7 +196,7 @@
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 vals = ctext(vals);
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 ids = cellfun (@isempty, vals);
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 if (any (ids))
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 - vals {find (ids)} = "";
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 + vals(ids) = {""};
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 endif
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 ## Cell addresses
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 valraws = cell2mat (regexp (rawdata, '<c r="(\w+)"(?: s="\d+")? t="s"><v(?:.*?)>\d+</v>', "tokens"));