diff options
| author | Richard M. Stallman | 2001-12-28 18:49:02 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2001-12-28 18:49:02 +0000 |
| commit | ade19cac432839b927051d37fe7937f7337c3318 (patch) | |
| tree | 4558bc4cdd33b91ef7d67853873e18105a4d2412 /src | |
| parent | ce6eef6e18b575359a7b26d63f42097de44e0092 (diff) | |
| download | emacs-ade19cac432839b927051d37fe7937f7337c3318.tar.gz emacs-ade19cac432839b927051d37fe7937f7337c3318.zip | |
Fix previous change; also correct its change log:
(Fdefine_key): Add error message for trying to bind [DEL], [RET], etc.
(exclude_keys): New variable.
(Flookup_key): Error message if key has wrong data type.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/keymap.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 16ffe8b6b7c..1f4a09c32b9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | * keymap.c (Flookup_key): Error message if key has wrong data type. | 3 | * keymap.c (Flookup_key): Error message if key has wrong data type. |
| 4 | (Fdefine_key): Add error message for trying to bind [DEL], [RET], etc. | 4 | (Fdefine_key): Add error message for trying to bind [DEL], [RET], etc. |
| 5 | 5 | (exclude_key): New variable. | |
| 6 | |||
| 6 | 2001-12-28 Gerd Moellmann <gerd@gnu.org> | 7 | 2001-12-28 Gerd Moellmann <gerd@gnu.org> |
| 7 | 8 | ||
| 8 | * xterm.c (x_setup_relief_colors): Don't compute an image's | 9 | * xterm.c (x_setup_relief_colors): Don't compute an image's |
diff --git a/src/keymap.c b/src/keymap.c index 38cafb916b7..ecc17e4a957 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -48,9 +48,6 @@ Lisp_Object meta_map; /* The keymap used for globally bound | |||
| 48 | Lisp_Object control_x_map; /* The keymap used for globally bound | 48 | Lisp_Object control_x_map; /* The keymap used for globally bound |
| 49 | C-x-prefixed default commands */ | 49 | C-x-prefixed default commands */ |
| 50 | 50 | ||
| 51 | /* Alist of elements like (DEL . "\d"). */ | ||
| 52 | Lisp_Object exclude_keys; | ||
| 53 | |||
| 54 | /* was MinibufLocalMap */ | 51 | /* was MinibufLocalMap */ |
| 55 | Lisp_Object Vminibuffer_local_map; | 52 | Lisp_Object Vminibuffer_local_map; |
| 56 | /* The keymap used by the minibuf for local | 53 | /* The keymap used by the minibuf for local |
| @@ -94,6 +91,9 @@ Lisp_Object Vdefine_key_rebound_commands; | |||
| 94 | 91 | ||
| 95 | Lisp_Object Qkeymapp, Qkeymap, Qnon_ascii, Qmenu_item; | 92 | Lisp_Object Qkeymapp, Qkeymap, Qnon_ascii, Qmenu_item; |
| 96 | 93 | ||
| 94 | /* Alist of elements like (DEL . "\d"). */ | ||
| 95 | static Lisp_Object exclude_keys; | ||
| 96 | |||
| 97 | /* A char with the CHAR_META bit set in a vector or the 0200 bit set | 97 | /* A char with the CHAR_META bit set in a vector or the 0200 bit set |
| 98 | in a string key sequence is equivalent to prefixing with this | 98 | in a string key sequence is equivalent to prefixing with this |
| 99 | character. */ | 99 | character. */ |