(Flookup_key): Fixed problem in 2001-12-28 patch:

The validation of the event type was too strict as it didn't
allow string events; buffer names are used in bindings for
menu-bar-select-buffer (see `menu-bar-update-buffers').

diff --git a/src/ChangeLog b/src/ChangeLog
index 99e4b445a3cd79920efba9ae9f37b6bbea825ed7..4157523f2e4704d29b692081c89832dcaa7ff92e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-24  Kim F. Storm  <storm@cua.dk>
+
+       * keymap.c (Flookup_key): Fixed problem in 2001-12-28 patch:
+       The validation of the event type was too strict as it didn't
+       allow string events; buffer names are used in bindings for
+       menu-bar-select-buffer (see `menu-bar-update-buffers').
+
 2002-02-23  Kim F. Storm  <storm@cua.dk>
 
        The following changes rework my patch of 2002-02-06 which 

diff --git a/src/keymap.c b/src/keymap.c
index fcb56bd44ae1d4349f52ac4cf83674c5dd146e40..e56a21a735a8fa3378bf64decb2cd75af7dc188c 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1142,7 +1142,9 @@ recognize the default bindings, just as `read-key-sequence' does.  */)
       if (XINT (c) & 0x80 && STRINGP (key))
        XSETINT (c, (XINT (c) | meta_modifier) & ~0x80);
 
-      if (!INTEGERP (c) && !SYMBOLP (c) && !CONSP (c))
+      /* Allow string since binding for `menu-bar-select-buffer'
+        includes the buffer name in the key sequence.  */
+      if (!INTEGERP (c) && !SYMBOLP (c) && !CONSP (c) && !STRINGP (c))
        error ("Key sequence contains invalid event");
 
       cmd = access_keymap (keymap, c, t_ok, 0, 1);