# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1236876338 14400
# Node ID 985792c9e0dad1de126058054e13b5fa102e9f86
# Parent  6b87f2f34fdd79f3e900e16aeced0f0de405e508
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

diff -r 6b87f2f34fdd -r 985792c9e0da src/ChangeLog
--- a/src/ChangeLog	Thu Mar 12 23:20:33 2009 +0800
+++ b/src/ChangeLog	Thu Mar 12 12:45:38 2009 -0400
@@ -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.
diff -r 6b87f2f34fdd -r 985792c9e0da src/ls-mat-ascii.cc
--- a/src/ls-mat-ascii.cc	Thu Mar 12 23:20:33 2009 +0800
+++ b/src/ls-mat-ascii.cc	Thu Mar 12 12:45:38 2009 -0400
@@ -81,7 +81,8 @@
 	{
 	  if (c == '\n' || c == '\r')
 	    {
-	      skip_until_newline (is, false);
+	      is.putback (c);
+	      skip_preceeding_newline (is);
 	      break;
 	    }