Merge from emacs--devo--0

[gnu-emacs] / lisp / isearch.el

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 612af7e0ecddaba195e4e263953d554b62f66459..4258c33f3d03c5ed68cf2a554d173522f9dccf94 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -306,15 +306,11 @@ A value of nil means highlight all matches."
 (defvar isearch-mode-map
   (let* ((i 0)
         (map (make-keymap)))
-    (or (vectorp (nth 1 map))
-       (char-table-p (nth 1 map))
+    (or (char-table-p (nth 1 map))
        (error "The initialization of isearch-mode-map must be updated"))
     ;; Make all multibyte characters search for themselves.
-    (let ((l (generic-character-list))
-         (table (nth 1 map)))
-      (while l
-       (set-char-table-default table (car l) 'isearch-printing-char)
-       (setq l (cdr l))))
+    (set-char-table-range (nth 1 map) (cons #x100 (max-char))
+                         'isearch-printing-char)
     ;; Make function keys, etc, which aren't bound to a scrolling-function
     ;; exit the search.
     (define-key map [t] 'isearch-other-control-char)
@@ -531,8 +527,7 @@ Type \\[isearch-yank-char] to yank char from buffer onto end of search\
  string and search for it.
 Type \\[isearch-yank-line] to yank rest of line onto end of search string\
  and search for it.
-Type \\[isearch-yank-kill] to yank last killed text onto end of search string\
- and search for it.
+Type \\[isearch-yank-kill] to yank the last string of killed text.
 Type \\[isearch-quote-char] to quote control character to search for it.
 \\[isearch-abort] while searching or when search has failed cancels input\
  back to what has
@@ -1957,9 +1952,8 @@ If there is no completion possible, say so and continue searching."
                       (concat " [" current-input-method-title "]: ")
                     ": ")
                   )))
-    (apply 'propertize
-          (concat (upcase (substring m 0 1)) (substring m 1))
-          minibuffer-prompt-properties)))
+    (propertize (concat (upcase (substring m 0 1)) (substring m 1))
+               'face 'minibuffer-prompt)))
 
 (defun isearch-message-suffix (&optional c-q-hack ellipsis)
   (concat (if c-q-hack "^Q" "")