Mercurial > emacs
changeset 76379:67cd2867fe17
Fix read-only prompt problem in isearch
`isearch-process-search-multibyte-characters' would signal an error if
minibuffer-prompt-properties contained a `read-only t' property.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-666
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 07 Mar 2007 18:48:33 +0000 |
| parents | 7722d7feb5cc |
| children | a5b023692148 |
| files | lisp/ChangeLog lisp/international/isearch-x.el |
| diffstat | 2 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Mar 07 15:08:46 2007 +0000 +++ b/lisp/ChangeLog Wed Mar 07 18:48:33 2007 +0000 @@ -1,3 +1,9 @@ +2007-03-07 Miles Bader <miles@gnu.org> + + * international/isearch-x.el + (isearch-process-search-multibyte-characters): Strip + text-properties from PROMPT to avoid an error from read-string. + 2007-03-07 Kim F. Storm <storm@cua.dk> * complete.el (PC-bindings): Remap lisp-complete-symbol to
--- a/lisp/international/isearch-x.el Wed Mar 07 15:08:46 2007 +0000 +++ b/lisp/international/isearch-x.el Wed Mar 07 18:48:33 2007 +0000 @@ -103,6 +103,15 @@ (prompt (isearch-message-prefix)) (minibuffer-local-map isearch-minibuffer-local-map) str junk-hist) + + ;; PROMPT contains text-properties from + ;; `minibuffer-prompt-properties', and some of these can screw up + ;; its use in `read-string' below (specifically, a read-only + ;; property will cause it to signal an error), so strip them here; + ;; read-string will add the same properties itself anyway. + ;; + (set-text-properties 0 (length prompt) nil prompt) + (if isearch-input-method-function (let (;; Let input method work rather tersely. (input-method-verbose-flag nil))