[Emacs-diffs] trunk r114514: * lisp/minibuffer.el (completion--replace): Be careful that `end' might be

[Stefan Monnier]

------------------------------------------------------------
revno: 114514
revision-id: address@hidden
parent: address@hidden
author: Jorgen Schaefer <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-03 22:12:16 -0400
message:
  * lisp/minibuffer.el (completion--replace): Be careful that `end' might be
  a marker.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/minibuffer.el             
minibuffer.el-20091113204419-o5vbwnq5f7feedwu-8622

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-03 07:11:27 +0000
+++ b/lisp/ChangeLog    2013-10-04 02:12:16 +0000
@@ -1,3 +1,8 @@
+2013-10-04  Jorgen Schaefer  <address@hidden>
+
+       * minibuffer.el (completion--replace): Be careful that `end' might be
+       a marker.
+
 2013-10-03  Daiki Ueno  <address@hidden>
 
        Add support for package signature checking.

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2013-09-26 00:46:29 +0000
+++ b/lisp/minibuffer.el        2013-10-04 02:12:16 +0000
@@ -873,8 +873,9 @@
       (setq end (- end suffix-len))
       (setq newtext (substring newtext 0 (- suffix-len))))
     (goto-char beg)
-    (insert-and-inherit newtext)
-    (delete-region (point) (+ (point) (- end beg)))
+    (let ((length (- end beg)))         ;Read `end' before we insert the text.
+      (insert-and-inherit newtext)
+      (delete-region (point) (+ (point) length)))
     (forward-char suffix-len)))
 
 (defcustom completion-cycle-threshold nil