* src/keyboard.c (safe_run_hooks_error): Don't unquote strings.

diff --git a/src/ChangeLog b/src/ChangeLog
index 381d2ad631c48e1fa97681d9bf25e6b600736a82..1c740904eb351696d76806ef74d5d87879f2f05a 100644 (file)
--- 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 e60420599c986fad19368b76914c1310001b46ce..79223116b2f19ec42bd48f44f816e5d15ea2ae43 100644 (file)
--- 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;