mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

* lisp/minibuffer.el (completion--replace): Better preserve markers.

Browse Source 
Fixes: debbugs:7138
This commit is contained in:
Stefan Monnier 2010-10-01 01:05:26 +02:00
parent 39e266f9bb
commit 55586d2a88
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2010-09-30 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (completion--replace):
Better preserve markers (bug#7138).
2010-09-29 Juanma Barranquero <lekktu@gmail.com> 2010-09-29 Juanma Barranquero <lekktu@gmail.com>
* server.el (server-process-filter): Doc fix. * server.el (server-process-filter): Doc fix.
@ -10,8 +15,8 @@
* Makefile.in (ELCFILES): Update. * Makefile.in (ELCFILES): Update.
* emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Avoid * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
infinite recursion on erroneous lambda form. (Bug#7114) Avoid infinite recursion on erroneous lambda form. (Bug#7114)
2010-09-27 Kenichi Handa <handa@m17n.org> 2010-09-27 Kenichi Handa <handa@m17n.org>

22
lisp/minibuffer.el
View File

@ -475,10 +475,30 @@ in the last `cdr'."
(defun completion--replace (beg end newtext) (defun completion--replace (beg end newtext)
"Replace the buffer text between BEG and END with NEWTEXT. "Replace the buffer text between BEG and END with NEWTEXT.
Moves point to the end of the new text." Moves point to the end of the new text."
;; This should be in subr.el. ;; Maybe this should be in subr.el.
;; You'd think this is trivial to do, but details matter if you want ;; You'd think this is trivial to do, but details matter if you want
;; to keep markers "at the right place" and be robust in the face of ;; to keep markers "at the right place" and be robust in the face of
;; after-change-functions that may themselves modify the buffer. ;; after-change-functions that may themselves modify the buffer.
(let ((prefix-len 0))
;; Don't touch markers in the shared prefix (if any).
(while (and (< prefix-len (length newtext))
(< (+ beg prefix-len) end)
(eq (char-after (+ beg prefix-len))
(aref newtext prefix-len)))
(setq prefix-len (1+ prefix-len)))
(unless (zerop prefix-len)
(setq beg (+ beg prefix-len))
(setq newtext (substring newtext prefix-len))))
(let ((suffix-len 0))
;; Don't touch markers in the shared suffix (if any).
(while (and (< suffix-len (length newtext))
(< beg (- end suffix-len))
(eq (char-before (- end suffix-len))
(aref newtext (- (length newtext) suffix-len 1))))
(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) (goto-char beg)
(insert newtext) (insert newtext)
(delete-region (point) (+ (point) (- end beg)))) (delete-region (point) (+ (point) (- end beg))))