[Emacs-diffs] /srv/bzr/emacs/trunk r100953: * src/keymap.c (Fdefine_key, Flookup_key): Say what event is invalid.

[Stefan Monnier]

------------------------------------------------------------
revno: 100953
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2010-08-01 02:14:14 +0200
message:
  * src/keymap.c (Fdefine_key, Flookup_key): Say what event is invalid.
modified:
  src/ChangeLog
  src/keymap.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-31 21:26:56 +0000
+++ b/src/ChangeLog     2010-08-01 00:14:14 +0000
@@ -1,3 +1,7 @@
+2010-08-01  Stefan Monnier  <address@hidden>
+
+       * keymap.c (Fdefine_key, Flookup_key): Say what event is invalid.
+
 2010-07-31  Chong Yidong  <address@hidden>
 
        * xselect.c (x_own_selection): Use list4.

=== modified file 'src/keymap.c'
--- a/src/keymap.c      2010-07-29 05:48:06 +0000
+++ b/src/keymap.c      2010-08-01 00:14:14 +0000
@@ -1226,7 +1226,7 @@
          && (!CONSP (c)
              /* If C is a range, it must be a leaf.  */
              || (INTEGERP (XCAR (c)) && idx != length)))
-       error ("Key sequence contains invalid event");
+       message_with_string ("Key sequence contains invalid event %s", c, 1);
 
       if (idx == length)
        RETURN_UNGCPRO (store_in_keymap (keymap, c, def));
@@ -1340,7 +1340,7 @@
       /* 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");
+       message_with_string ("Key sequence contains invalid event %s", c, 1);
 
       cmd = access_keymap (keymap, c, t_ok, 0, 1);
       if (idx == length)