diff options
| author | Karoly Lorentey | 2005-10-28 14:29:24 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-10-28 14:29:24 +0000 |
| commit | 2e4782930af512802ac0ee1067d22b5136524dfc (patch) | |
| tree | d6d1f6be38ffa2b3e7c917246c7a28ce0db58f28 /src/keymap.c | |
| parent | 7a81ec10b3821910ca633767b521259a056dbebe (diff) | |
| download | emacs-2e4782930af512802ac0ee1067d22b5136524dfc.tar.gz emacs-2e4782930af512802ac0ee1067d22b5136524dfc.zip | |
Change `keyboard-translate-table' to be terminal-local.
* lisp/subr.el (keyboard-translate): Use `terminal-local-value' to access `keyboard-translate-table'.
* lisp/obsolete/keyswap.el: Ditto.
* src/keyboard.c (Vkeyboard_translate_table): Moved to struct kboard.
* src/keyboard.h (Vkeyboard_translate_table): Moved to struct kboard.
* src/keyboard.c (read_char): Use current_kboard to access Vkeyboard_translate_table.
* src/keymap.c (Fdescribe_buffer_bindings): Ditto.
* src/keyboard.c (init_kboard): Initialize Vkeyboard_translate_table.
* src/keyboard.c (syms_of_keyboard): Use DEFVAR_KBOARD to define
Vkeyboard_translate_table. Update doc strings.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-431
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/keymap.c b/src/keymap.c index 8fa4d91a9c7..7e5b00bc771 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2812,11 +2812,11 @@ You type Translation\n\ | |||
| 2812 | outbuf = Fcurrent_buffer (); | 2812 | outbuf = Fcurrent_buffer (); |
| 2813 | 2813 | ||
| 2814 | /* Report on alternates for keys. */ | 2814 | /* Report on alternates for keys. */ |
| 2815 | if (STRINGP (Vkeyboard_translate_table) && !NILP (prefix)) | 2815 | if (STRINGP (current_kboard->Vkeyboard_translate_table) && !NILP (prefix)) |
| 2816 | { | 2816 | { |
| 2817 | int c; | 2817 | int c; |
| 2818 | const unsigned char *translate = SDATA (Vkeyboard_translate_table); | 2818 | const unsigned char *translate = SDATA (current_kboard->Vkeyboard_translate_table); |
| 2819 | int translate_len = SCHARS (Vkeyboard_translate_table); | 2819 | int translate_len = SCHARS (current_kboard->Vkeyboard_translate_table); |
| 2820 | 2820 | ||
| 2821 | for (c = 0; c < translate_len; c++) | 2821 | for (c = 0; c < translate_len; c++) |
| 2822 | if (translate[c] != c) | 2822 | if (translate[c] != c) |
| @@ -2839,7 +2839,7 @@ You type Translation\n\ | |||
| 2839 | insert ("\n", 1); | 2839 | insert ("\n", 1); |
| 2840 | 2840 | ||
| 2841 | /* Insert calls signal_after_change which may GC. */ | 2841 | /* Insert calls signal_after_change which may GC. */ |
| 2842 | translate = SDATA (Vkeyboard_translate_table); | 2842 | translate = SDATA (current_kboard->Vkeyboard_translate_table); |
| 2843 | } | 2843 | } |
| 2844 | 2844 | ||
| 2845 | insert ("\n", 1); | 2845 | insert ("\n", 1); |