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

[Stefan Monnier]

------------------------------------------------------------
revno: 106874
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10062
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-01-16 10:50:28 -0500
message:
  * lisp/minibuffer.el (completion--replace): Strip properties.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-16 09:34:41 +0000
+++ b/lisp/ChangeLog    2012-01-16 15:50:28 +0000
@@ -1,3 +1,7 @@
+2012-01-16  Stefan Monnier  <address@hidden>
+
+       * minibuffer.el (completion--replace): Strip properties (bug#10062).
+
 2012-01-16  Martin Rudalics  <address@hidden>
 
        * window.el (window-state-ignored-parameters): Remove variable.
@@ -47,7 +51,7 @@
 
        Fix Emacs bug #10463 - put `widen's around the critical spots.
 
-        * progmodes/cc-engine.el (c-in-literal, c-literal-limits): put a
+       * progmodes/cc-engine.el (c-in-literal, c-literal-limits): Put a
        widen around each invocation of c-state-pp-to-literal.  Remove an
        unused let variable.
 
@@ -58,8 +62,8 @@
 
 2012-01-10  Chong Yidong  <address@hidden>
 
-       * net/network-stream.el (network-stream-open-starttls): Avoid
-       emitting a confusing error message when the server gives a bad
+       * net/network-stream.el (network-stream-open-starttls):
+       Avoid emitting a confusing error message when the server gives a bad
        response to the capability command.
 
 2012-01-10  Glenn Morris  <address@hidden>
@@ -152,8 +156,8 @@
 
        * custom.el (enable-theme): Don't set custom-safe-themes.
 
-       * cus-theme.el (custom-theme-merge-theme): Ignore
-       custom-enabled-themes and custom-safe-themes.
+       * cus-theme.el (custom-theme-merge-theme):
+       Ignore custom-enabled-themes and custom-safe-themes.
 
 2012-01-05  Michael R. Mauger  <address@hidden>
 
@@ -176,8 +180,8 @@
 
 2012-01-03  Chong Yidong  <address@hidden>
 
-       * shell.el (shell-dynamic-complete-functions): Put
-       pcomplete-completions-at-point, so as to try
+       * shell.el (shell-dynamic-complete-functions):
+       Put pcomplete-completions-at-point, so as to try
        comint-filename-completion first (Bug#10417).
 
 2012-01-02  Richard Stallman  <address@hidden>
@@ -202,8 +206,8 @@
 
 2012-01-01  Eli Zaretskii  <address@hidden>
 
-       * term/w32-win.el (dynamic-library-alist) <gnutls>: Load
-       libgnutls-28.dll, from GnuTLS version 3.x, in preference to
+       * term/w32-win.el (dynamic-library-alist) <gnutls>:
+       Load libgnutls-28.dll, from GnuTLS version 3.x, in preference to
        libgnutls-26.dll.
 
 2011-12-31  Andreas Schwab  <address@hidden>
@@ -255,11 +259,10 @@
 2011-12-24  Alan Mackenzie  <address@hidden>
 
        Introduce a mechanism to widen the region used in context font
-       locking.  Use this to protect declarations from losing their
-       contexts.
+       locking.  Use this to protect declarations from losing their contexts.
 
-       * progmodes/cc-langs.el (c-before-font-lock-functions): Replace
-       c-set-fl-decl-start with c-change-set-fl-decl-start (Renaming).
+       * progmodes/cc-langs.el (c-before-font-lock-functions):
+       Replace c-set-fl-decl-start with c-change-set-fl-decl-start (Renaming).
        (c-before-context-fontification-functions): New defvar, a list of
        functions to be run just before context (etc.) font locking.
 
@@ -411,22 +414,19 @@
 
        * progmodes/cc-langs (c-label-kwds): Let AWK take the same
        expression as the rest.
-       (c-nonlabel-token-key): Allow string literals for AWK.  Refactor
-       for the other modes.
+       (c-nonlabel-token-key): Allow string literals for AWK.
+       Refactor for the other modes.
 
        Large brace-block initialisation makes CC Mode slow: Fix.
-       Tidy up and accelerate c-in-literal, etc. by using the
-       c-parse-state
+       Tidy up and accelerate c-in-literal, etc. by using the c-parse-state
        routines.  Limit backward searching in c-font-lock-enclosing.decl.
 
        * progmodes/cc-engine.el (c-state-pp-to-literal): Return the
        pp-state and literal type in addition to the limits.
-       (c-state-safe-place): New defun, extracted from
-       c-state-literal-at.
+       (c-state-safe-place): New defun, extracted from c-state-literal-at.
        (c-state-literal-at): Use the above new defun.
-       (c-slow-in-literal, c-fast-in-literal): Removed.
-       (c-in-literal, c-literal-limits): Amended to use
-       c-state-pp-to-literal.
+       (c-slow-in-literal, c-fast-in-literal): Remove.
+       (c-in-literal, c-literal-limits): Amend to use c-state-pp-to-literal.
 
        * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): Check for
        being in a literal.  Add a limit for backward searching.
@@ -500,8 +500,8 @@
 2011-12-10  Eli Zaretskii  <address@hidden>
 
        * mail/rmailsum.el (rmail-header-summary): RFC2047 decode the
-       `from' or `to' address before taking its substring.  Fixes
-       incorrect display in Rmail summary buffer whereby an RFC2047
+       `from' or `to' address before taking its substring.
+       Fixes incorrect display in Rmail summary buffer whereby an RFC2047
        encoded name is chopped in the middle of the encoded string, and
        thus displayed encoded.
 
@@ -720,8 +720,8 @@
        (verilog-uvm-statement-re): Support UVM indentation and
        highlighting, with old OVM keywords only.
        (verilog-auto-tieoff, verilog-auto-tieoff-declaration):
-       Support AUTOTIEOFF creating non-wire data types.  Suggested by Jonathan
-       Greenlaw.
+       Support AUTOTIEOFF creating non-wire data types.
+       Suggested by Jonathan Greenlaw.
        (verilog-auto-insert-lisp, verilog-delete-to-paren)
        (verilog-forward-sexp-cmt, verilog-forward-sexp-ign-cmt)
        (verilog-inject-sense, verilog-read-inst-pins)
@@ -807,11 +807,11 @@
        Andrew Drake.
        (verilog-auto-star-safe, verilog-delete-auto-star-implicit)
        (verilog-inst-comment-re): Fix not deleting Interfaced comment
-       when expanding .* in interfaces, bug320.  Reported by Pierre-David
-       Pfister.
+       when expanding .* in interfaces, bug320.
+       Reported by Pierre-David Pfister.
        (verilog-read-module-name): Fix import statements between module
-       name and open parenthesis, bug317.  Reported by Pierre-David
-       Pfister.
+       name and open parenthesis, bug317.
+       Reported by Pierre-David Pfister.
        (verilog-simplify-range-expression): Fix simplification of
        multiplications inside AUTOWIRE connections, bug303.
        (verilog-auto-inst-port): Support parameter expansion in
@@ -1065,8 +1065,7 @@
 
 2011-11-19  Andreas Schwab  <address@hidden>
 
-       * progmodes/sh-script.el (sh-assignment-regexp): Add entry for
-       bash.
+       * progmodes/sh-script.el (sh-assignment-regexp): Add entry for bash.
 
 2011-11-19  Juri Linkov  <address@hidden>
 
@@ -1191,8 +1190,7 @@
 
        * window.el (window-resize, delete-window, split-window):
        Replace window-splits by window-combination-resize.
-       * cus-start.el (window-splits): Replace by
-       window-combination-resize.
+       * cus-start.el (window-splits): Replace by window-combination-resize.
 
 2011-11-17  Glenn Morris  <address@hidden>
 
@@ -1257,8 +1255,7 @@
        * window.el (split-window, window-state-get-1)
        (window-state-put-1, window-state-put-2): Rename occurrences of
        window-nest to window-combination-limit.
-       * cus-start.el (window-nest): Rename to
-       window-combination-limit.
+       * cus-start.el (window-nest): Rename to window-combination-limit.
 
 2011-11-16  Chong Yidong  <address@hidden>
 

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2012-01-05 09:46:05 +0000
+++ b/lisp/minibuffer.el        2012-01-16 15:50:28 +0000
@@ -571,6 +571,10 @@
 (defun completion--replace (beg end newtext)
   "Replace the buffer text between BEG and END with NEWTEXT.
 Moves point to the end of the new text."
+  ;; The properties on `newtext' include things like
+  ;; completions-first-difference, which we don't want to include
+  ;; upon insertion.
+  (set-text-properties 0 (length newtext) nil newtext)
   ;; Maybe this should be in subr.el.
   ;; 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