diff --git a/src/ChangeLog b/src/ChangeLog
index d991c2dac72c9888bf455ab359b07e041b644ab6..6eb5125d20c3056bf3722c19cfe61019a163325b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* cmds.c (Fself_insert_command): Don't pass a non-integer to XINT.
+
 2013-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* alloc.c (make_event_array): First arg is now ptrdiff_t, not int.
diff --git a/src/cmds.c b/src/cmds.c
index ee3be79a0ab9637e63041f99bcbd95db033d672d..aeedb152f623ee2d8f389676b14a94e1cf62ee6b 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -304,7 +304,7 @@ At the end, it runs `post-self-insert-hook'.  */)
   /* Barf if the key that invoked this was not a character.  */
   if (!CHARACTERP (last_command_event))
     bitch_at_user ();
-  {
+  else {
     int character = translate_char (Vtranslation_table_for_input,
 				    XINT (last_command_event));
     int val = internal_self_insert (character, XFASTINT (n));