* lisp/minibuffer.el (completion--replace): Move point where it belongs

when there's a common suffix.

Fixes: debbugs:7215

2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0cbd35d5fc..7c560c33b9d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion--replace): Move point where it belongs
+        when there's a common suffix (bug#7215).
+
 2010-10-15  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-open-connection-setup-interactive-shell):
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index a4ab5261f7c..bc5a1d2e807 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -498,10 +498,11 @@ Moves point to the end of the new text."
       (setq suffix-len (1+ suffix-len)))
     (unless (zerop suffix-len)
       (setq end (- end suffix-len))
-      (setq newtext (substring newtext 0 (- suffix-len)))))
-  (goto-char beg)
-  (insert newtext)
-  (delete-region (point) (+ (point) (- end beg))))
+      (setq newtext (substring newtext 0 (- suffix-len))))
+    (goto-char beg)
+    (insert newtext)
+    (delete-region (point) (+ (point) (- end beg)))
+    (forward-char suffix-len)))
 
 (defun completion--do-completion (&optional try-completion-function)
   "Do the completion and return a summary of what happened.