(print-fontset): Handling of the

[gnu-emacs] / lisp / international / isearch-x.el

diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index a002df6687b131ca4cd5d7765860d7cb96c30502..66202a6d11d85bd722bfa4f8d3c8d58260be8aeb 100644 (file)
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -1,9 +1,9 @@
 ;;; isearch-x.el --- extended isearch handling commands
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007, 2008, 2009
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -14,10 +14,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,9 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -103,6 +101,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))
@@ -134,5 +141,5 @@
          (isearch-update)))
     (isearch-process-search-char last-char)))
 
-;;; arch-tag: 1a90a6cf-2cb2-477a-814a-9ff895852822
+;; arch-tag: 1a90a6cf-2cb2-477a-814a-9ff895852822
 ;;; isearch-x.el ends here