diff scripts/io/textread.m @ 19630:0e1f5a750d00

maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jan 2015 10:24:46 -0500
parents 6ca096827123 446c46af4b42
children 4197fc428c7d
line wrap: on
line diff
--- a/scripts/io/textread.m	Tue Jan 20 09:55:41 2015 -0500
+++ b/scripts/io/textread.m	Tue Jan 20 10:24:46 2015 -0500
@@ -133,7 +133,7 @@
     ## Set up default endofline param value
     varargin(end+1:end+2) = {"endofline", eol_char};
   endif
- 
+
   ## Now that we know what EOL looks like, we can process format_repeat_count.
   ## FIXME: The below isn't ML-compatible: counts lines, not format string uses
   if (isfinite (nlines) && (nlines > 0))
@@ -170,7 +170,7 @@
     str = fread (fid, "char=>char").';
   endif
   fclose (fid);
- 
+
   ## Set up default whitespace param value if needed
   if (isempty (find (strcmpi ("whitespace", varargin))))
     varargin(end+1:end+2) = {"whitespace", " \b\t"};
@@ -182,7 +182,7 @@
   ## Hack to concatenate/reshape numeric output into 2D array (undocumented ML)
   ## In ML this only works in case of an empty format string
   if (isempty (format))
-    ## Get number of fields per line. 
+    ## Get number of fields per line.
     ## 1. Get eol_char position
     iwhsp = find (strcmpi ("whitespace", varargin));
     whsp = varargin{iwhsp + 1};