* progmodes/octave.el (octave-mode, inferior-octave-mode): Fix

obsolete variable comment-use-global-state.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 014dbea7b5166898677bdbee191407b6550fc457..12085f38e5f2687c6429404c9a5142cb46f04c92 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-21  Leo Liu  <sdl.web@gmail.com>
+
+       * progmodes/octave.el (octave-mode, inferior-octave-mode): Fix
+       obsolete variable comment-use-global-state.
+
 2013-11-21  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
        * progmodes/octave.el (octave-mode-map, octave-mode-menu): Add

diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index c09dea59c271cb2aca8717ff9e832309b5b0ad96..540bd93517d29509afb5209dcf94c508ffaacc1a 100644 (file)
--- 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."
   ;; 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-use-syntax t)
   (setq-local comment-start octave-comment-start)
   (setq-local comment-end "")
   (setq-local comment-start-skip octave-comment-start-skip)
@@ -703,7 +703,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-use-syntax t)
   (setq-local comment-start octave-comment-start)
   (setq-local comment-end "")
   (setq comment-column 32)