Mercurial > octave-nkf
changeset 13175:8aaaef4a69aa
maint: periodic merge of stable to default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 20 Sep 2011 15:38:24 -0400 |
| parents | 536c6a5ab705 (current diff) bd2cd4fd3edf (diff) |
| children | 9b8e786bbf3c |
| files | scripts/general/accumarray.m scripts/plot/axis.m scripts/sparse/gmres.m |
| diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/general/accumarray.m Tue Sep 20 15:28:46 2011 -0400 +++ b/scripts/general/accumarray.m Tue Sep 20 15:38:24 2011 -0400 @@ -51,7 +51,7 @@ ## that in the first column counts how many occurrences each number in ## the second column has, taken from the vector @var{x}. Note the usage ## of @code{unique} for assigning to all repeated elements of @var{x} -## the same index (@xref{doc-unique}). +## the same index (@pxref{doc-unique}). ## ## @example ## @group
--- a/scripts/miscellaneous/getappdata.m Tue Sep 20 15:28:46 2011 -0400 +++ b/scripts/miscellaneous/getappdata.m Tue Sep 20 15:38:24 2011 -0400 @@ -40,7 +40,7 @@ appdata.(name) = []; end_try_catch val(nh) = {appdata.(name)}; - end + endfor if (nh == 1) val = val{1}; endif
--- a/scripts/miscellaneous/setappdata.m Tue Sep 20 15:28:46 2011 -0400 +++ b/scripts/miscellaneous/setappdata.m Tue Sep 20 15:38:24 2011 -0400 @@ -33,7 +33,7 @@ for nh = 1:numel(h) if (! isfield (get (h(nh)), "__appdata__")) addproperty ("__appdata__", h(nh), "any", struct ()); - end + endif appdata = get (h(nh), "__appdata__"); for narg = 1:2:numel(varargin) if (iscellstr (varargin{narg}))
--- a/scripts/plot/axis.m Tue Sep 20 15:28:46 2011 -0400 +++ b/scripts/plot/axis.m Tue Sep 20 15:38:24 2011 -0400 @@ -321,7 +321,7 @@ scale = get (ca, strcat (ax, "scale")); if (strcmp (scale, "log") && any (data > 0)) data(data<=0) = NaN; - end + endif if (iscell (data)) data = data (find (! cellfun ("isempty", data))); if (! isempty (data))