* progmodes/octave.el (octave-operator-regexp): Exclude newline.

Fixes: debbugs:15076

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01cc8e4884789492a29f90be4900b798d7d8d23c..17f3f4c0c1ff324099e75e3400d7c41f4d46d6b3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-22  Leo Liu  <sdl.web@gmail.com>
+
+       * progmodes/octave.el (octave-operator-regexp): Exclude newline.
+       (Bug#15076)
+
 2013-11-22  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/octave.el (inferior-octave-process-live-p): New helper.

diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 6187e5f098f2ad1bbae6165268e2e7c044c16ed9..3d68b57cd6576c4a67d3d8e7d003cea493863cc9 100644 (file)
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -363,7 +363,8 @@ Non-nil means always go to the next Octave code line after sending."
 ;; corresponding continuation lines).
 
 (defconst octave-operator-regexp
-  (regexp-opt (apply 'append (mapcar 'cdr octave-operator-table))))
+  (regexp-opt (remove "\n" (apply 'append
+                                  (mapcar 'cdr octave-operator-table)))))
 
 (defun octave-smie-backward-token ()
   (let ((pos (point)))