diff options
| author | Leo Liu | 2013-11-22 10:32:35 +0800 |
|---|---|---|
| committer | Leo Liu | 2013-11-22 10:32:35 +0800 |
| commit | 7a7567d2bea13ef5ef8ad916be79ca8b2013bc1c (patch) | |
| tree | 64f15e7d72a0af2bf1a3c10fc4006f3a59a3fdb2 | |
| parent | 724bc2658767f0e2c11b3fbe9ec72490ef30cbb2 (diff) | |
| download | emacs-7a7567d2bea13ef5ef8ad916be79ca8b2013bc1c.tar.gz emacs-7a7567d2bea13ef5ef8ad916be79ca8b2013bc1c.zip | |
* progmodes/octave.el (octave-operator-regexp): Exclude newline.
Fixes: debbugs:15076
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/octave.el | 3 |
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 @@ | |||
| 1 | 2013-11-22 Leo Liu <sdl.web@gmail.com> | 1 | 2013-11-22 Leo Liu <sdl.web@gmail.com> |
| 2 | 2 | ||
| 3 | * progmodes/octave.el (octave-operator-regexp): Exclude newline. | ||
| 4 | (Bug#15076) | ||
| 5 | |||
| 6 | 2013-11-22 Leo Liu <sdl.web@gmail.com> | ||
| 7 | |||
| 3 | * progmodes/octave.el (inferior-octave-process-live-p): New helper. | 8 | * progmodes/octave.el (inferior-octave-process-live-p): New helper. |
| 4 | (inferior-octave-startup, inferior-octave-check-process) | 9 | (inferior-octave-startup, inferior-octave-check-process) |
| 5 | (inferior-octave-track-window-width-change) | 10 | (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." | |||
| 363 | ;; corresponding continuation lines). | 363 | ;; corresponding continuation lines). |
| 364 | 364 | ||
| 365 | (defconst octave-operator-regexp | 365 | (defconst octave-operator-regexp |
| 366 | (regexp-opt (apply 'append (mapcar 'cdr octave-operator-table)))) | 366 | (regexp-opt (remove "\n" (apply 'append |
| 367 | (mapcar 'cdr octave-operator-table))))) | ||
| 367 | 368 | ||
| 368 | (defun octave-smie-backward-token () | 369 | (defun octave-smie-backward-token () |
| 369 | (let ((pos (point))) | 370 | (let ((pos (point))) |