diff options
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/keymap.c b/src/keymap.c index 1734ac1baa9..a8d197208b7 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -79,9 +79,6 @@ Lisp_Object Vminor_mode_overriding_map_alist; | |||
| 79 | /* List of emulation mode keymap alists. */ | 79 | /* List of emulation mode keymap alists. */ |
| 80 | Lisp_Object Vemulation_mode_map_alists; | 80 | Lisp_Object Vemulation_mode_map_alists; |
| 81 | 81 | ||
| 82 | /* Keymap mapping ASCII function key sequences onto their preferred forms. */ | ||
| 83 | Lisp_Object Vkey_translation_map; | ||
| 84 | |||
| 85 | /* A list of all commands given new bindings since a certain time | 82 | /* A list of all commands given new bindings since a certain time |
| 86 | when nil was stored here. | 83 | when nil was stored here. |
| 87 | This is used to speed up recomputation of menu key equivalents | 84 | This is used to speed up recomputation of menu key equivalents |
| @@ -2844,8 +2841,8 @@ You type Translation\n\ | |||
| 2844 | insert ("\n", 1); | 2841 | insert ("\n", 1); |
| 2845 | } | 2842 | } |
| 2846 | 2843 | ||
| 2847 | if (!NILP (Vkey_translation_map)) | 2844 | if (!NILP (current_kboard->Vkey_translation_map)) |
| 2848 | describe_map_tree (Vkey_translation_map, 0, Qnil, prefix, | 2845 | describe_map_tree (current_kboard->Vkey_translation_map, 0, Qnil, prefix, |
| 2849 | "Key translations", nomenu, 1, 0, 0); | 2846 | "Key translations", nomenu, 1, 0, 0); |
| 2850 | 2847 | ||
| 2851 | 2848 | ||
| @@ -3797,12 +3794,6 @@ the same way. The "active" keymaps in each alist are used before | |||
| 3797 | `minor-mode-map-alist' and `minor-mode-overriding-map-alist'. */); | 3794 | `minor-mode-map-alist' and `minor-mode-overriding-map-alist'. */); |
| 3798 | Vemulation_mode_map_alists = Qnil; | 3795 | Vemulation_mode_map_alists = Qnil; |
| 3799 | 3796 | ||
| 3800 | DEFVAR_LISP ("key-translation-map", &Vkey_translation_map, | ||
| 3801 | doc: /* Keymap of key translations that can override keymaps. | ||
| 3802 | This keymap works like `function-key-map', but comes after that, | ||
| 3803 | and its non-prefix bindings override ordinary bindings. */); | ||
| 3804 | Vkey_translation_map = Qnil; | ||
| 3805 | |||
| 3806 | staticpro (&Vmouse_events); | 3797 | staticpro (&Vmouse_events); |
| 3807 | Vmouse_events = Fcons (intern ("menu-bar"), | 3798 | Vmouse_events = Fcons (intern ("menu-bar"), |
| 3808 | Fcons (intern ("tool-bar"), | 3799 | Fcons (intern ("tool-bar"), |