2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b0feea559e6..39237924e11 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-10  John W. Eaton  <jwe@octave.org>
+
+        * emacs/octave-mod.el (octave-electric-space): Don't indent
+        comments or strings if octave-auto-indent is nil.
+
 2005-12-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * term/mac-win.el: Require url when compiling.  Call
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index 0cda438fa6a..56dac972472 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -1311,7 +1311,8 @@ Maybe expand abbrevs and blink matching block open keywords.
 Reindent the line of `octave-auto-indent' is non-nil."
   (interactive)
   (setq last-command-char ? )
-  (if (not (octave-not-in-string-or-comment-p))
+  (if (and octave-auto-indent
+           (not (octave-not-in-string-or-comment-p)))
       (progn
         (indent-according-to-mode)
         (self-insert-command 1))