diff options
author | Leo Liu <sdl.web@gmail.com> | 2013-06-07 19:48:28 +0800 |
---|---|---|
committer | Leo Liu <sdl.web@gmail.com> | 2013-06-07 19:48:28 +0800 |
commit | a175bf337ae1cb146bf01f69648cd5cbe35d4384 (patch) | |
tree | bbde4dca7baf42da9b709051f22726011fb1d41a /lisp/progmodes/octave.el | |
parent | a822acffe2a370ed1726db92aad64b5287582a73 (diff) | |
download | emacs-a175bf337ae1cb146bf01f69648cd5cbe35d4384.tar.gz emacs-a175bf337ae1cb146bf01f69648cd5cbe35d4384.tar.bz2 emacs-a175bf337ae1cb146bf01f69648cd5cbe35d4384.zip |
* newcomment.el (comment-search-backward): Revert last change.
* emacs-lisp/smie.el (smie--matching-block-data): Minor simplification.
* progmodes/octave.el (octave-mode): Set comment-use-global-state
to t. (Bug#14303)
Fixes: debbugs:14434 debbugs:14303
Diffstat (limited to 'lisp/progmodes/octave.el')
-rw-r--r-- | lisp/progmodes/octave.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index efa735e99b9..14d04b0d03c 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -540,6 +540,7 @@ definitions can also be stored in files and used in batch mode." ;; a ";" at those places where it's correct (i.e. outside of parens). (setq-local electric-layout-rules '((?\; . after))) + (setq-local comment-use-global-state t) (setq-local comment-start octave-comment-start) (setq-local comment-end "") (setq-local comment-start-skip octave-comment-start-skip) @@ -664,6 +665,7 @@ in the Inferior Octave buffer.") :abbrev-table octave-abbrev-table (setq comint-prompt-regexp inferior-octave-prompt) + (setq-local comment-use-global-state t) (setq-local comment-start octave-comment-start) (setq-local comment-end "") (setq comment-column 32) |