Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / lisp / isearch.el

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 9e396f27545caf9998802edaeb7857d8fcff1a12..df868e7abfcf52c62871eff0f127c28cb1ca9dfb 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1644,9 +1644,10 @@ Isearch mode."
                 (this-command-keys)))
         (main-event (aref key 0))
         (keylist (listify-key-sequence key))
+        (fkm (terminal-local-value 'local-function-key-map nil))
          scroll-command isearch-point)
     (cond ((and (= (length key) 1)
-               (let ((lookup (lookup-key function-key-map key)))
+               (let ((lookup (lookup-key fkm key)))
                  (not (or (null lookup) (integerp lookup)
                           (keymapp lookup)))))
           ;; Handle a function key that translates into something else.
@@ -1660,7 +1661,7 @@ Isearch mode."
                 (isearch-done)
                 (apply 'isearch-unread keylist))
             (setq keylist
-                  (listify-key-sequence (lookup-key function-key-map key)))
+                  (listify-key-sequence (lookup-key fkm key)))
             (while keylist
               (setq key (car keylist))
               ;; If KEY is a printing char, we handle it here