2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01cc8e48847..17f3f4c0c1f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 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.
         (inferior-octave-startup, inferior-octave-check-process)
         (inferior-octave-track-window-width-change)
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 6187e5f098f..3d68b57cd65 100644
--- 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)))