diff options
| author | Richard M. Stallman | 2002-05-20 14:50:25 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-05-20 14:50:25 +0000 |
| commit | 301d4a3f34e23bb74c1eb33775d8f53596d81241 (patch) | |
| tree | 16a017a56e343a47c256685f39e2563554229fd9 /src | |
| parent | 45885400510833c61da0c0aff800577234fc303a (diff) | |
| download | emacs-301d4a3f34e23bb74c1eb33775d8f53596d81241.tar.gz emacs-301d4a3f34e23bb74c1eb33775d8f53596d81241.zip | |
(read_char_minibuf_menu_prompt): Don't list equivalent key bindings here.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/keyboard.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c7640fa91bd..99e03b87961 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2002-05-20 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * keyboard.c (read_char_minibuf_menu_prompt): Don't list | ||
| 4 | equivalent key bindings here. | ||
| 5 | |||
| 1 | 2002-05-20 Ken Raeburn <raeburn@gnu.org> | 6 | 2002-05-20 Ken Raeburn <raeburn@gnu.org> |
| 2 | 7 | ||
| 3 | Change symbol structure to contain a lisp object for the symbol | 8 | Change symbol structure to contain a lisp object for the symbol |
diff --git a/src/keyboard.c b/src/keyboard.c index 25e0c69af1d..ffc86840865 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -7727,12 +7727,14 @@ read_char_minibuf_menu_prompt (commandflag, nmaps, maps) | |||
| 7727 | if (! char_matches) | 7727 | if (! char_matches) |
| 7728 | desc = Fsingle_key_description (event, Qnil); | 7728 | desc = Fsingle_key_description (event, Qnil); |
| 7729 | 7729 | ||
| 7730 | #if 0 /* It is redundant to list the equivalent key bindings because | ||
| 7731 | the prefix is what the user has already typed. */ | ||
| 7730 | tem | 7732 | tem |
| 7731 | = XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ]; | 7733 | = XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ]; |
| 7732 | if (!NILP (tem)) | 7734 | if (!NILP (tem)) |
| 7733 | /* Insert equivalent keybinding. */ | 7735 | /* Insert equivalent keybinding. */ |
| 7734 | s = concat2 (s, tem); | 7736 | s = concat2 (s, tem); |
| 7735 | 7737 | #endif | |
| 7736 | tem | 7738 | tem |
| 7737 | = XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE]; | 7739 | = XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE]; |
| 7738 | if (EQ (tem, QCradio) || EQ (tem, QCtoggle)) | 7740 | if (EQ (tem, QCradio) || EQ (tem, QCtoggle)) |