aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-03-28 11:54:54 -0400
committerStefan Monnier2012-03-28 11:54:54 -0400
commite8fc049ff7ed71d570f320d9a90d8b2546db5de2 (patch)
tree1cb1f468b6f312098e360881618c59838e9badc5
parent38de3354b79e6d58d130adeee12a98d35b00db47 (diff)
downloademacs-e8fc049ff7ed71d570f320d9a90d8b2546db5de2.tar.gz
emacs-e8fc049ff7ed71d570f320d9a90d8b2546db5de2.zip
* src/keyboard.c (safe_run_hooks_error): Don't unquote strings.
-rw-r--r--src/ChangeLog7
-rw-r--r--src/keyboard.c2
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 @@
12012-03-28 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * keyboard.c (safe_run_hooks_error): Don't unquote strings.
4
12012-03-27 Glenn Morris <rgm@gnu.org> 52012-03-27 Glenn Morris <rgm@gnu.org>
2 6
3 * search.c (Fword_search_backward_lax, Fword_search_forward_lax): 7 * search.c (Fword_search_backward_lax, Fword_search_forward_lax):
@@ -16,8 +20,7 @@
16 20
172012-03-25 Fabrice Popineau <fabrice.popineau@supelec.fr> 212012-03-25 Fabrice Popineau <fabrice.popineau@supelec.fr>
18 22
19 * w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific 23 * w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific code.
20 code.
21 24
222012-03-25 Kenichi Handa <handa@m17n.org> 252012-03-25 Kenichi Handa <handa@m17n.org>
23 26
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)
1881 = CONSP (Vinhibit_quit) ? XCAR (Vinhibit_quit) : Vinhibit_quit; 1881 = CONSP (Vinhibit_quit) ? XCAR (Vinhibit_quit) : Vinhibit_quit;
1882 Lisp_Object fun = CONSP (Vinhibit_quit) ? XCDR (Vinhibit_quit) : Qnil; 1882 Lisp_Object fun = CONSP (Vinhibit_quit) ? XCDR (Vinhibit_quit) : Qnil;
1883 Lisp_Object args[4]; 1883 Lisp_Object args[4];
1884 args[0] = build_string ("Error in %s (%s): %s"); 1884 args[0] = build_string ("Error in %s (%s): %S");
1885 args[1] = hook; 1885 args[1] = hook;
1886 args[2] = fun; 1886 args[2] = fun;
1887 args[3] = error_data; 1887 args[3] = error_data;