aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-10-17 12:30:02 -0400
committerStefan Monnier2011-10-17 12:30:02 -0400
commit96a8a0dfd60cc141d0d65510edfad53ea435b961 (patch)
tree321c4808e1f89b54a1439a3925fa1fdda5194414
parent8b79f3e0ed805d86dcb0e74572e61da2cd2d8ffc (diff)
downloademacs-96a8a0dfd60cc141d0d65510edfad53ea435b961.tar.gz
emacs-96a8a0dfd60cc141d0d65510edfad53ea435b961.zip
* lisp/minibuffer.el (completion--replace): Inherit surrounding properties.
(minibuffer-complete-and-exit): Use it. Fixes: debbugs:114
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/minibuffer.el6
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ebca8675ce..60c2b62cfe2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12011-10-17 Stefan Monnier <monnier@iro.umontreal.ca> 12011-10-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * minibuffer.el (completion--replace): Inherit surrounding properties
4 (bug#114).
5 (minibuffer-complete-and-exit): Use it.
6
3 * comint.el (comint--table-subvert): Quote the all-completions output 7 * comint.el (comint--table-subvert): Quote the all-completions output
4 (bug#9160). 8 (bug#9160).
5 9
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index acb71d115d1..38785fc48e8 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -596,7 +596,7 @@ Moves point to the end of the new text."
596 (setq end (- end suffix-len)) 596 (setq end (- end suffix-len))
597 (setq newtext (substring newtext 0 (- suffix-len)))) 597 (setq newtext (substring newtext 0 (- suffix-len))))
598 (goto-char beg) 598 (goto-char beg)
599 (insert newtext) 599 (insert-and-inherit newtext)
600 (delete-region (point) (+ (point) (- end beg))) 600 (delete-region (point) (+ (point) (- end beg)))
601 (forward-char suffix-len))) 601 (forward-char suffix-len)))
602 602
@@ -927,9 +927,7 @@ If `minibuffer-completion-confirm' is `confirm-after-completion',
927 ;; file, so `try-completion' actually completes to 927 ;; file, so `try-completion' actually completes to
928 ;; that file. 928 ;; that file.
929 (= (length string) (length compl))) 929 (= (length string) (length compl)))
930 (goto-char end) 930 (completion--replace beg end compl))))
931 (insert compl)
932 (delete-region beg end))))
933 (exit-minibuffer)) 931 (exit-minibuffer))
934 932
935 ((memq minibuffer-completion-confirm '(confirm confirm-after-completion)) 933 ((memq minibuffer-completion-confirm '(confirm confirm-after-completion))