# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1280621654 -7200
# Node ID 0a12f74cc5d8e23d2834bfc7bf3f7d1b7adfb0db
# Parent  52a2d97e28e48def97df58386b45c78f383b9676
* src/keymap.c (Fdefine_key, Flookup_key): Say what event is invalid.

diff -r 52a2d97e28e4 -r 0a12f74cc5d8 src/ChangeLog
--- a/src/ChangeLog	Sat Jul 31 17:26:56 2010 -0400
+++ b/src/ChangeLog	Sun Aug 01 02:14:14 2010 +0200
@@ -1,3 +1,7 @@
+2010-08-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* keymap.c (Fdefine_key, Flookup_key): Say what event is invalid.
+
 2010-07-31  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xselect.c (x_own_selection): Use list4.
diff -r 52a2d97e28e4 -r 0a12f74cc5d8 src/keymap.c
--- a/src/keymap.c	Sat Jul 31 17:26:56 2010 -0400
+++ b/src/keymap.c	Sun Aug 01 02:14:14 2010 +0200
@@ -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)