# HG changeset patch
# User jwe
# Date 1133577724 0
# Node ID 91cdb5f1eeedcea96aa555402d4a07a2a4e88bf8
# Parent  dc24a787b96bcd70eefd872e26d4b6525a2b700e
[project @ 2005-12-03 02:42:04 by jwe]

diff -r dc24a787b96b -r 91cdb5f1eeed ChangeLog
--- a/ChangeLog	Thu Dec 01 20:40:14 2005 +0000
+++ b/ChangeLog	Sat Dec 03 02:42:04 2005 +0000
@@ -1,3 +1,8 @@
+2005-12-02  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-11-30  John W. Eaton  <jwe@octave.org>
 
 	* examples/Makefile.in (install install-strip): Install images and
diff -r dc24a787b96b -r 91cdb5f1eeed emacs/octave-mod.el
--- a/emacs/octave-mod.el	Thu Dec 01 20:40:14 2005 +0000
+++ b/emacs/octave-mod.el	Sat Dec 03 02:42:04 2005 +0000
@@ -1329,7 +1329,8 @@
 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))