diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-07-12 10:55:24 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-07-12 10:55:24 +0000 |
| commit | ac09dc1ec3f67a1a7a26411106480fea4e4d90b2 (patch) | |
| tree | e7cdbb75b89ab72dd49caeab6f30a7c4d315a8f3 /lisp/edmacro.el | |
| parent | a9d63618b0fea2f1740d50736cbd37cc587aecb1 (diff) | |
| download | emacs-ac09dc1ec3f67a1a7a26411106480fea4e4d90b2.tar.gz | |
Rename function-key-map to local-function-key-map, and global-function-key-map to function-key-map. Same for key-translation-map.
* src/keyboard.h (struct kboard): Rename member 'Vfunction_key_map' to
'Vlocal_function_key_map', and 'Vkey_translation_map' to
'Vlocal_key_translation_map'.
(Vfunction_key_map, Vkey_translation_map): New declarations.
* src/keyboard.c (Vfunction_key_map): New variable.
(Vglobal_key_translation_map): Rename to Vglobal_key_translation_map.
(read_key_sequence, init_kboard, syms_of_keyboard, mark_kboards): Update.
* src/keymap.c (Fdescribe_buffer_bindings): Update.
* src/term.c (term_get_fkeys_1): Update.
* lisp/double.el (double-setup): Replace global-key-translation-map with key-translation-map.
* lisp/international/encoded-kb.el (encoded-kbd-setup-display): Ditto.
* lisp/international/iso-transl.el: Ditto.
* lisp/obsolete/iso-acc.el (iso-accents-customize): Ditto.
* lisp/edmacro.el (edmacro-format-keys): Use terminal-local binding of
local-function-key-map instead of function-key-map.
* lisp/emulation/cua-base.el (cua--pre-command-handler): Ditto.
* lisp/isearch.el (isearch-other-meta-char): Ditto.
* lisp/subr.el (read-quoted-char): Ditto.
* lisp/term/vt200.el: Ditto.
* lisp/term/vt201.el: Ditto.
* lisp/term/vt220.el: Ditto.
* lisp/term/vt240.el: Ditto.
* lisp/term/vt300.el: Ditto.
* lisp/term/vt320.el: Ditto.
* lisp/term/vt400.el: Ditto.
* lisp/term/vt420.el: Ditto.
* lisp/simple.el (normal-erase-is-backspace-mode): Add todo note.
* lisp/xt-mouse.el: Ditto.
* lisp/term/AT386.el: Adapt for renaming of function-key-map to local-function-key-map.
* lisp/term/internal.el: Ditto.
* lisp/term/iris-ansi.el: Ditto.
* lisp/term/lk201.el: Ditto.
* lisp/term/mac-win.el: Ditto.
* lisp/term/news.el: Ditto.
* lisp/term/rxvt.el: Ditto.
* lisp/term/sun.el: Ditto.
* lisp/term/tvi970.el: Ditto.
* lisp/term/wyse50.el: Ditto.
* lisp/term/x-win.el (x-setup-function-keys): Ditto.
* lisp/term/xterm.el: Ditto.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-386
Diffstat (limited to 'lisp/edmacro.el')
| -rw-r--r-- | lisp/edmacro.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 4ab7c7b1029..4384a0288e1 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -443,7 +443,8 @@ doubt, use whitespace." (rest-mac (vconcat macro [end-macro])) (res "") (len 0) - (one-line (eq verbose 1))) + (one-line (eq verbose 1)) + (fkm (terminal-local-value 'local-function-key-map nil))) (if one-line (setq verbose nil)) (when (stringp macro) (loop for i below (length macro) do @@ -488,9 +489,9 @@ doubt, use whitespace." (fkey nil) tlen tkey (bind (or (loop for map in maps for b = (lookup-key map key) thereis (and (not (integerp b)) b)) - (and (setq fkey (lookup-key function-key-map rest-mac)) + (and (setq fkey (lookup-key fkm rest-mac)) (setq tlen fkey tkey (edmacro-subseq rest-mac 0 tlen) - fkey (lookup-key function-key-map tkey)) + fkey (lookup-key fkm tkey)) (loop for map in maps for b = (lookup-key map fkey) when (and (not (integerp b)) b) |