aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2013-11-22 01:33:30 +0800
committerLeo Liu2013-11-22 01:33:30 +0800
commit38637ccae650eefa403717a9cafe78a0b1923042 (patch)
tree54b0b2cee577971e6296b1934a8985486697a31d
parent4e8b693819c766e3c5c66096f500802559d9e124 (diff)
downloademacs-38637ccae650eefa403717a9cafe78a0b1923042.tar.gz
emacs-38637ccae650eefa403717a9cafe78a0b1923042.zip
* progmodes/octave.el (octave-mode, inferior-octave-mode): Fix
obsolete variable comment-use-global-state.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/octave.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 014dbea7b51..12085f38e5f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-11-21 Leo Liu <sdl.web@gmail.com>
2
3 * progmodes/octave.el (octave-mode, inferior-octave-mode): Fix
4 obsolete variable comment-use-global-state.
5
12013-11-21 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de> 62013-11-21 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de>
2 7
3 * progmodes/octave.el (octave-mode-map, octave-mode-menu): Add 8 * progmodes/octave.el (octave-mode-map, octave-mode-menu): Add
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index c09dea59c27..540bd93517d 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -547,7 +547,7 @@ definitions can also be stored in files and used in batch mode."
547 ;; a ";" at those places where it's correct (i.e. outside of parens). 547 ;; a ";" at those places where it's correct (i.e. outside of parens).
548 (setq-local electric-layout-rules '((?\; . after))) 548 (setq-local electric-layout-rules '((?\; . after)))
549 549
550 (setq-local comment-use-global-state t) 550 (setq-local comment-use-syntax t)
551 (setq-local comment-start octave-comment-start) 551 (setq-local comment-start octave-comment-start)
552 (setq-local comment-end "") 552 (setq-local comment-end "")
553 (setq-local comment-start-skip octave-comment-start-skip) 553 (setq-local comment-start-skip octave-comment-start-skip)
@@ -703,7 +703,7 @@ in the Inferior Octave buffer.")
703 :abbrev-table octave-abbrev-table 703 :abbrev-table octave-abbrev-table
704 (setq comint-prompt-regexp inferior-octave-prompt) 704 (setq comint-prompt-regexp inferior-octave-prompt)
705 705
706 (setq-local comment-use-global-state t) 706 (setq-local comment-use-syntax t)
707 (setq-local comment-start octave-comment-start) 707 (setq-local comment-start octave-comment-start)
708 (setq-local comment-end "") 708 (setq-local comment-end "")
709 (setq comment-column 32) 709 (setq comment-column 32)