[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107968: * lisp/electric.el (electric-indent-post-self-insert-function): Check that

[Stefan Monnier]

------------------------------------------------------------
revno: 107968
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-04-19 18:02:25 -0400
message:
  * lisp/electric.el (electric-indent-post-self-insert-function): Check that
  electric-indent-mode is enabled in current buffer.
modified:
  lisp/ChangeLog
  lisp/electric.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-19 21:34:49 +0000
+++ b/lisp/ChangeLog    2012-04-19 22:02:25 +0000
@@ -1,3 +1,8 @@
+2012-04-19  Stefan Monnier  <address@hidden>
+
+       * electric.el (electric-indent-post-self-insert-function): Check that
+       electric-indent-mode is enabled in current buffer.
+
 2012-04-19  Juanma Barranquero  <address@hidden>
 
        * imenu.el (imenu-progress-message): Restore; it is "used" in

=== modified file 'lisp/electric.el'
--- a/lisp/electric.el  2012-02-09 02:40:41 +0000
+++ b/lisp/electric.el  2012-04-19 22:02:25 +0000
@@ -215,6 +215,7 @@
   ;; it looks challenging.
   (let (pos)
     (when (and
+           electric-indent-mode
            ;; Don't reindent while inserting spaces at beginning of line.
            (or (not (memq last-command-event '(?\s ?\t)))
                (save-excursion (skip-chars-backward " \t") (not (bolp))))