[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100117: * lisp/minibuffer.el (completion--replace): Move point where it belongs

[Stefan Monnier]

------------------------------------------------------------
revno: 100117
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-10-17 13:30:22 -0400
message:
  * lisp/minibuffer.el (completion--replace): Move point where it belongs
  when there's a common suffix.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-15 12:15:43 +0000
+++ b/lisp/ChangeLog    2010-10-17 17:30:22 +0000
@@ -1,3 +1,8 @@
+2010-10-17  Stefan Monnier  <address@hidden>
+
+       * minibuffer.el (completion--replace): Move point where it belongs
+       when there's a common suffix (bug#7215).
+
 2010-10-15  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-open-connection-setup-interactive-shell):

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2010-10-03 19:50:14 +0000
+++ b/lisp/minibuffer.el        2010-10-17 17:30:22 +0000
@@ -498,10 +498,11 @@
       (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.