# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1193190663 0
# Node ID 9a8400cb685cb0115ad5d2f13814ec740c1f5384
# Parent  7b879ab0abb9f891849ba9bab9d566e372249e21
(reindent-then-newline-and-indent): Use a `move after
insert' kind of marker in the save-excursion.

diff -r 7b879ab0abb9 -r 9a8400cb685c lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Oct 23 22:46:42 2007 +0000
+++ b/lisp/ChangeLog	Wed Oct 24 01:51:03 2007 +0000
@@ -1,3 +1,8 @@
+2007-10-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* simple.el (reindent-then-newline-and-indent): Use a `move after
+	insert' kind of marker in the save-excursion.
+
 2007-10-23  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-set-file-uid-gid): Protect `call-process'
diff -r 7b879ab0abb9 -r 9a8400cb685c lisp/simple.el
--- a/lisp/simple.el	Tue Oct 23 22:46:42 2007 +0000
+++ b/lisp/simple.el	Wed Oct 24 01:51:03 2007 +0000
@@ -633,9 +633,16 @@
     (newline)
     (save-excursion
       (goto-char pos)
-      ;; Usually indent-according-to-mode should "preserve" point, but it is
-      ;; not guaranteed; e.g. indent-to-left-margin doesn't.
-      (save-excursion (indent-according-to-mode))
+      ;; We are at EOL before the call to indent-according-to-mode, and
+      ;; after it we usually are as well, but not always.  We tried to
+      ;; address it with `save-excursion' but that uses a normal marker
+      ;; whereas we need `move after insertion', so we do the save/restore
+      ;; by hand.
+      (setq pos (copy-marker pos t))
+      (indent-according-to-mode)
+      (goto-char pos)
+      ;; Remove the trailing white-space after indentation because
+      ;; indentation may introduce the whitespace.
       (delete-horizontal-space t))
     (indent-according-to-mode)))