* lisp/electric.el (electric-indent-post-self-insert-function):

Don't auto-indent for indent-to-left-margin, it's too often
counter-productive.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bc9ccfbf284f5ea8676c5bfb1c72b696772d144..969b0c6997a1150af31f5e0d999c034166dde40a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * electric.el (electric-indent-post-self-insert-function):
+       Don't auto-indent for indent-to-left-margin, it's too often
+       counter-productive.
+
 2011-01-16  Tassilo Horn  <tassilo@member.fsf.org>
 
        * strokes.el (strokes-read-stroke): Re-fill strokes buffer with
@@ -54,12 +60,12 @@
 
 2011-01-15  Kenichi Handa  <handa@m17n.org>
 
-       * mail/rmailmm.el (rmail-mime-insert-header): Set
-       rmail-mime-coding-system to a cons whose car is the last coding
+       * mail/rmailmm.el (rmail-mime-insert-header):
+       Set rmail-mime-coding-system to a cons whose car is the last coding
        system used to decode the header.
        (rmail-mime-find-header-encoding): New function.
-       (rmail-mime-insert-decoded-text): Override
-       rmail-mime-coding-system if it is a cons.
+       (rmail-mime-insert-decoded-text):
+       Override rmail-mime-coding-system if it is a cons.
        (rmail-show-mime): If only a header part was decoded, find the
        coding system while ignoring mm-charset-override-alist.
 
@@ -72,8 +78,8 @@
        * mail/rmailmm.el (rmail-mime-next-item)
        (rmail-mime-previous-item): Delete them.
        (rmail-mime-shown-mode): Recursively call for children.
-       (rmail-mime-hidden-mode): Delete the 2nd arg TOP.  Callers
-       changed.
+       (rmail-mime-hidden-mode): Delete the 2nd arg TOP.
+       Callers changed.
        (rmail-mime-raw-mode): Recursively call for children.
        (rmail-mode-map): Change mapping of tab and backtab to
        forward-button and backward-button respectively.
@@ -82,7 +88,7 @@
        (rmail-mime-update-tagline): New function.
        (rmail-mime-insert-text): Call rmail-mime-update-tagline if the
        body display is changed.
-       (rmail-mime-toggle-button): Renamed from rmail-mime-image.
+       (rmail-mime-toggle-button): Rename from rmail-mime-image.
        (rmail-mime-image): Delete this button type.
        (rmail-mime-toggle): New button type.
        (rmail-mime-insert-bulk): Call rmail-mime-update-tagline if the
@@ -329,8 +335,8 @@
        menus.  Add menu item for customize-themes.
 
        * cus-theme.el (customize-themes):
-       * emacs-lisp/package.el (package--list-packages): Use
-       switch-to-buffer.
+       * emacs-lisp/package.el (package--list-packages):
+       Use switch-to-buffer.
 
 2011-01-11  Johan Bockgård  <bojohan@gnu.org>
 

diff --git a/lisp/electric.el b/lisp/electric.el
index f777ac1af575ace3f6330d6dc8a0c3684bd769b6..9a269a5c23d2e9b1e28dc898bc675c73ad7682e9 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -221,7 +221,8 @@ Returns nil when we can't find this char."
         (let ((before (copy-marker (1- pos) t)))
           (save-excursion
             (unless (memq indent-line-function
-                          '(indent-relative indent-relative-maybe))
+                          '(indent-relative indent-to-left-margin
+                            indent-relative-maybe))
               ;; Don't reindent the previous line if the indentation function
               ;; is not a real one.
               (goto-char before)
@@ -235,7 +236,8 @@ Returns nil when we can't find this char."
             ;; Remove the trailing whitespace after indentation because
             ;; indentation may (re)introduce the whitespace.
             (delete-horizontal-space t))))
-      (indent-according-to-mode))))
+      (unless (memq indent-line-function '(indent-to-left-margin))
+        (indent-according-to-mode)))))
 
 ;;;###autoload
 (define-minor-mode electric-indent-mode