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

[gnu-emacs] / lisp / emulation / cua-base.el

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 0e60e60b4c463438d80fb7c9935453a4758a811e..1b937da5018dc49d670e4c28a6cb94f16b7ee956 100644 (file)
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1089,9 +1089,9 @@ If ARG is the atom `-', scroll upward by nearly full screen."
             (memq 'shift (event-modifiers
                           (aref (this-single-command-keys) 0)))
             ;; See if raw escape sequence maps to a shifted event, e.g. S-up or C-S-home.
-            (and (boundp 'function-key-map)
-                 function-key-map
-                 (let ((ev (lookup-key function-key-map
+            (and (boundp 'local-function-key-map)
+                 (terminal-local-value 'function-key-map nil)
+                 (let ((ev (lookup-key (terminal-local-value 'function-key-map nil)
                                        (this-single-command-raw-keys))))
                    (and (vector ev)
                         (symbolp (setq ev (aref ev 0)))