diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-03-28 11:54:54 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-03-28 11:54:54 -0400 |
| commit | e8fc049ff7ed71d570f320d9a90d8b2546db5de2 (patch) | |
| tree | 1cb1f468b6f312098e360881618c59838e9badc5 | |
| parent | 38de3354b79e6d58d130adeee12a98d35b00db47 (diff) | |
| download | emacs-e8fc049ff7ed71d570f320d9a90d8b2546db5de2.tar.gz | |
* src/keyboard.c (safe_run_hooks_error): Don't unquote strings.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 381d2ad631c..1c740904eb3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-03-28 Stefan Monnier <monnier@iro.umontreal.ca> + + * keyboard.c (safe_run_hooks_error): Don't unquote strings. + 2012-03-27 Glenn Morris <rgm@gnu.org> * search.c (Fword_search_backward_lax, Fword_search_forward_lax): @@ -16,8 +20,7 @@ 2012-03-25 Fabrice Popineau <fabrice.popineau@supelec.fr> - * w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific - code. + * w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific code. 2012-03-25 Kenichi Handa <handa@m17n.org> diff --git a/src/keyboard.c b/src/keyboard.c index e60420599c9..79223116b2f 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1881,7 +1881,7 @@ safe_run_hooks_error (Lisp_Object error_data) = CONSP (Vinhibit_quit) ? XCAR (Vinhibit_quit) : Vinhibit_quit; Lisp_Object fun = CONSP (Vinhibit_quit) ? XCDR (Vinhibit_quit) : Qnil; Lisp_Object args[4]; - args[0] = build_string ("Error in %s (%s): %s"); + args[0] = build_string ("Error in %s (%s): %S"); args[1] = hook; args[2] = fun; args[3] = error_data; |