Mercurial > hg > octave-lyh

changeset 8962:985792c9e0da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ls-mat-ascii.cc (get_mat_data_input_line): if looking at CR or LF, skip current line ending instead of skipping until the next
author John W. Eaton <jwe@octave.org>
date Thu, 12 Mar 2009 12:45:38 -0400
parents 6b87f2f34fdd
children d1eab3ddb02d
files src/ChangeLog src/ls-mat-ascii.cc
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-12  John W. Eaton  <jwe@octave.org>
+
+	* ls-mat-ascii.cc (get_mat_data_input_line): If we are looking at
+	'\r' or '\n', skip current line ending instead of skipping until
+	the next.
+
 2009-03-12  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-flt-perm.h, ov-flt-perm.cc: Remove sources.
--- a/src/ls-mat-ascii.cc
+++ b/src/ls-mat-ascii.cc
@@ -81,7 +81,8 @@
 	{
 	  if (c == '\n' || c == '\r')
 	    {
-	      skip_until_newline (is, false);
+	      is.putback (c);
+	      skip_preceeding_newline (is);
 	      break;
 	    }