* progmodes/octave.el: Compatible with older emacs-24 releases.

2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa2003a9aba..be8329a856c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,8 @@
 2013-05-01  Leo Liu  <sdl.web@gmail.com>
 
-        * progmodes/octave.el (inferior-octave-has-built-in-variables):
-        Remove.  Buil-in variables were removed from Octave in 2007.
+        * progmodes/octave.el: Compatible with older emacs-24 releases.
+        (inferior-octave-has-built-in-variables): Remove.  Buil-in
+        variables were removed from Octave in 2007.
         (inferior-octave-startup): Fix uses.
         (comint-line-beginning-position): Remove compatibility code for
         emacs 21.
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index f12365552f9..4b02645e463 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -34,6 +34,14 @@
 ;;; Code:
 (require 'comint)
 
+;;; For emacs < 24.3.
+(require 'newcomment)
+(eval-when-compile
+  (unless (fboundp 'setq-local)
+    (defmacro setq-local (var val)
+      "Set variable VAR to value VAL in current buffer."
+      (list 'set (list 'make-local-variable (list 'quote var)) val))))
+
 (defgroup octave nil
   "Editing Octave code."
   :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)