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

2 files changed, 15 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c24f6579ba..d3cb2fb94c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
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))