# HG changeset patch
# User jwe
# Date 1043299377 0
# Node ID fd7d9a6e15ffb8f33ac0c397655dbf282bcbc2ef
# Parent  e15a96673976ce11d739ac21de9ab07890f5c4b6
[project @ 2003-01-23 05:22:57 by jwe]

diff -r e15a96673976 -r fd7d9a6e15ff ChangeLog
--- a/ChangeLog	Thu Jan 23 03:03:08 2003 +0000
+++ b/ChangeLog	Thu Jan 23 05:22:57 2003 +0000
@@ -1,3 +1,8 @@
+2003-01-22  Richard Stallman <rms@gnu.org>
+
+	* emacs/octave-mod.el (octave-mode-map): Avoid binding keys that
+	are reserved for users.
+
 2003-01-22  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makeconf.in: Fix typo in previous change.
diff -r e15a96673976 -r fd7d9a6e15ff emacs/octave-mod.el
--- a/emacs/octave-mod.el	Thu Jan 23 03:03:08 2003 +0000
+++ b/emacs/octave-mod.el	Thu Jan 23 05:22:57 2003 +0000
@@ -228,15 +228,22 @@
     (define-key map "\C-c\M-\C-d" 'octave-down-block)
     (define-key map "\C-c\M-\C-h" 'octave-mark-block)
     (define-key map "\C-c]" 'octave-close-block)
-    (define-key map "\C-cf" 'octave-insert-defun)
+    (define-key map "\C-c\C-f" 'octave-insert-defun)
     (define-key map "\C-c\C-h" 'octave-help)
-    (define-key map "\C-cil" 'octave-send-line)
-    (define-key map "\C-cib" 'octave-send-block)
-    (define-key map "\C-cif" 'octave-send-defun)
-    (define-key map "\C-cir" 'octave-send-region)  
-    (define-key map "\C-cis" 'octave-show-process-buffer)
-    (define-key map "\C-cih" 'octave-hide-process-buffer)
-    (define-key map "\C-cik" 'octave-kill-process)
+    (define-key map "\C-c\C-il" 'octave-send-line)
+    (define-key map "\C-c\C-ib" 'octave-send-block)
+    (define-key map "\C-c\C-if" 'octave-send-defun)
+    (define-key map "\C-c\C-ir" 'octave-send-region)  
+    (define-key map "\C-c\C-is" 'octave-show-process-buffer)
+    (define-key map "\C-c\C-ih" 'octave-hide-process-buffer)
+    (define-key map "\C-c\C-ik" 'octave-kill-process)
+    (define-key map "\C-c\C-i\C-l" 'octave-send-line)
+    (define-key map "\C-c\C-i\C-b" 'octave-send-block)
+    (define-key map "\C-c\C-i\C-f" 'octave-send-defun)
+    (define-key map "\C-c\C-i\C-r" 'octave-send-region)  
+    (define-key map "\C-c\C-i\C-s" 'octave-show-process-buffer)
+    (define-key map "\C-c\C-i\C-h" 'octave-hide-process-buffer)
+    (define-key map "\C-c\C-i\C-k" 'octave-kill-process)
     (setq octave-mode-map map)))
 
 (defvar octave-mode-menu
diff -r e15a96673976 -r fd7d9a6e15ff src/ChangeLog
--- a/src/ChangeLog	Thu Jan 23 03:03:08 2003 +0000
+++ b/src/ChangeLog	Thu Jan 23 05:22:57 2003 +0000
@@ -1,5 +1,8 @@
 2003-01-22  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* load-save.cc (get_mat_data_input_line): Handle lines with CR
+	only as separator.
+
 	* oct-stream.cc (octave_base_stream::do_printf): Handle Inf and
 	NaN in int conversions for compatibility with Matlab.
 
diff -r e15a96673976 -r fd7d9a6e15ff src/load-save.cc
--- a/src/load-save.cc	Thu Jan 23 03:03:08 2003 +0000
+++ b/src/load-save.cc	Thu Jan 23 05:22:57 2003 +0000
@@ -1842,14 +1842,15 @@
       char c;
       while (is.get (c))
 	{
-	  if (c == '\n')
+	  if (c == '\n' || c == '\r')
 	    break;
 
 	  if (c == '%' || c == '#')
 	    {
 	      // skip to end of line
-	      while (is.get (c) && c != '\n')
-		;
+	      while (is.get (c))
+		if (c == '\n' || c == '\r')
+		  break;
 
 	      break;
 	    }