Mercurial > octave
changeset 12980:421f2030bb76
Merge in Daniel's changes
author | Jordi Gutiérrez Hermoso <jordigh@gmail.com> |
---|---|
date | Fri, 19 Aug 2011 12:39:55 -0500 |
parents | 6a9fbeff3368 (current diff) f89449967f0d (diff) |
children | 4ec4096f65d1 |
files | |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/strings/deblank.m Fri Aug 19 12:39:45 2011 -0500 +++ b/scripts/strings/deblank.m Fri Aug 19 12:39:55 2011 -0500 @@ -42,7 +42,7 @@ s = s(:,1:ceil (max (k) / rows (s))); endif - elseif (iscell (s)) + elseif (iscellstr (s)) s = regexprep (s, "[\\s\v\\0]+$", '');
--- a/scripts/strings/strtrim.m Fri Aug 19 12:39:45 2011 -0500 +++ b/scripts/strings/strtrim.m Fri Aug 19 12:39:55 2011 -0500 @@ -53,7 +53,7 @@ s = s(:, ceil (min (k) / rows (s)):ceil (max (k) / rows (s))); endif - elseif (iscell (s)) + elseif (iscellstr (s)) s = regexprep (s, "^[\\s\v]+|[\\s\v]+$", '');