summaryrefslogtreecommitdiff
path: root/lisp/international
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-03-07 18:48:33 +0000
committerMiles Bader <miles@gnu.org>2007-03-07 18:48:33 +0000
commit8256bd38106db3a24c67c9e68a792d94c5484664 (patch)
tree578ff78d05951eed3862da130c3622414520fbfb /lisp/international
parent6e52f715f3c389100a2a6450ee91081046d2460d (diff)
downloademacs-8256bd38106db3a24c67c9e68a792d94c5484664.tar.gz
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
Diffstat (limited to 'lisp/international')
-rw-r--r--lisp/international/isearch-x.el9
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index 76a33d2569e..b75a7cdaab3 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -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))