[Emacs-diffs] /srv/bzr/emacs/trunk r106100: * lisp/minibuffer.el (completion--replace): Inherit surrounding properties.

[Stefan Monnier]

------------------------------------------------------------
revno: 106100
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=114
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-10-17 12:30:02 -0400
message:
  * lisp/minibuffer.el (completion--replace): Inherit surrounding properties.
  (minibuffer-complete-and-exit): Use it.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-17 13:43:40 +0000
+++ b/lisp/ChangeLog    2011-10-17 16:30:02 +0000
@@ -1,5 +1,9 @@
 2011-10-17  Stefan Monnier  <address@hidden>
 
+       * minibuffer.el (completion--replace): Inherit surrounding properties
+       (bug#114).
+       (minibuffer-complete-and-exit): Use it.
+
        * comint.el (comint--table-subvert): Quote the all-completions output
        (bug#9160).
 

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2011-10-11 05:17:04 +0000
+++ b/lisp/minibuffer.el        2011-10-17 16:30:02 +0000
@@ -596,7 +596,7 @@
       (setq end (- end suffix-len))
       (setq newtext (substring newtext 0 (- suffix-len))))
     (goto-char beg)
-    (insert newtext)
+    (insert-and-inherit newtext)
     (delete-region (point) (+ (point) (- end beg)))
     (forward-char suffix-len)))
 
@@ -927,9 +927,7 @@
                      ;; file, so `try-completion' actually completes to
                      ;; that file.
                      (= (length string) (length compl)))
-            (goto-char end)
-            (insert compl)
-            (delete-region beg end))))
+            (completion--replace beg end compl))))
       (exit-minibuffer))
 
      ((memq minibuffer-completion-confirm '(confirm confirm-after-completion))