(reindent-then-newline-and-indent): Use a `move after

insert' kind of marker in the save-excursion.

2 files changed, 15 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 258a6361427..0b3c86d4097 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/simple.el b/lisp/simple.el
index eb76cd490d4..317acdaff31 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -633,9 +633,16 @@ column specified by the function `current-left-margin'."
     (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)))