aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-06 19:51:18 -0700
committerPaul Eggert2011-04-06 19:51:18 -0700
commitbff87ef0301f6039ffcf1f2eb5503fa262a32285 (patch)
tree75d719df0963432957c18f6462c03e12af8e16d3 /src
parent7e2cac200108a4626573c4a8de851560c1fee456 (diff)
downloademacs-bff87ef0301f6039ffcf1f2eb5503fa262a32285.tar.gz
emacs-bff87ef0301f6039ffcf1f2eb5503fa262a32285.zip
* keyboard.c (access_keymap_keyremap): Print func name, not garbage.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 34e0e1b4cad..d31710bcbca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-04-07 Paul Eggert <eggert@cs.ucla.edu>
2
3 * keyboard.c (access_keymap_keyremap): Print func name, not garbage.
4
12011-04-06 Paul Eggert <eggert@cs.ucla.edu> 52011-04-06 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * coding.c (Fdecode_sjis_char): Don't assume CODE fits in int. 7 * coding.c (Fdecode_sjis_char): Don't assume CODE fits in int.
diff --git a/src/keyboard.c b/src/keyboard.c
index ae4fddb2c89..7a8451d8375 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8778,7 +8778,8 @@ access_keymap_keyremap (Lisp_Object map, Lisp_Object key, Lisp_Object prompt,
8778 (To ignore it safely, we would need to gcpro a bunch of 8778 (To ignore it safely, we would need to gcpro a bunch of
8779 other variables.) */ 8779 other variables.) */
8780 if (! (VECTORP (next) || STRINGP (next))) 8780 if (! (VECTORP (next) || STRINGP (next)))
8781 error ("Function %s returns invalid key sequence", tem); 8781 error ("Function %s returns invalid key sequence",
8782 SSDATA (SYMBOL_NAME (tem)));
8782 } 8783 }
8783 return next; 8784 return next;
8784} 8785}