aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2013-09-04 22:27:13 -0400
committerStefan Monnier2013-09-04 22:27:13 -0400
commita7e43722c705f2b124fe7fa6a41cac76d0fe5b3a (patch)
treeb709fd07782a1a93548943befd1ba3cc6a4bf416 /src
parent2a6f417413360a4910bac0b096534571bc938071 (diff)
downloademacs-a7e43722c705f2b124fe7fa6a41cac76d0fe5b3a.tar.gz
emacs-a7e43722c705f2b124fe7fa6a41cac76d0fe5b3a.zip
* src/cmds.c (Fself_insert_command): Don't pass a non-integer to XINT.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/cmds.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d991c2dac72..6eb5125d20c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-09-05 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * cmds.c (Fself_insert_command): Don't pass a non-integer to XINT.
4
12013-09-04 Paul Eggert <eggert@cs.ucla.edu> 52013-09-04 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * alloc.c (make_event_array): First arg is now ptrdiff_t, not int. 7 * alloc.c (make_event_array): First arg is now ptrdiff_t, not int.
diff --git a/src/cmds.c b/src/cmds.c
index ee3be79a0ab..aeedb152f62 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -304,7 +304,7 @@ At the end, it runs `post-self-insert-hook'. */)
304 /* Barf if the key that invoked this was not a character. */ 304 /* Barf if the key that invoked this was not a character. */
305 if (!CHARACTERP (last_command_event)) 305 if (!CHARACTERP (last_command_event))
306 bitch_at_user (); 306 bitch_at_user ();
307 { 307 else {
308 int character = translate_char (Vtranslation_table_for_input, 308 int character = translate_char (Vtranslation_table_for_input,
309 XINT (last_command_event)); 309 XINT (last_command_event));
310 int val = internal_self_insert (character, XFASTINT (n)); 310 int val = internal_self_insert (character, XFASTINT (n));