diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-29 05:28:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-29 05:28:10 +0000 |
| commit | 094c7f5e487d843e7a01053234fa38d2410a3c06 (patch) | |
| tree | 6edec2eb16745059d3b57054525a2533a741c0c8 /lisp/emulation | |
| parent | 13f0affc77ff56a4e4ec962ba4c92ccbf39b33a0 (diff) | |
| parent | 6a7189971f336259dcd1c9bde7797f26445dc5d9 (diff) | |
| download | emacs-merge-multi-tty-to-trunk.tar.gz | |
Merge multi-tty branchmerge-multi-tty-to-trunk
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-866
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/cua-base.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 98a9b4d6361..5e18953752a 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1233,9 +1233,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) + local-function-key-map + (let ((ev (lookup-key local-function-key-map (this-single-command-raw-keys)))) (and (vector ev) (symbolp (setq ev (aref ev 0))) |