diff options
| author | Stefan Monnier | 2013-06-03 11:18:18 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-06-03 11:18:18 -0400 |
| commit | a8a7c5f651cd9c3d354a4cb4938e5289d4cbbe4b (patch) | |
| tree | cf9664003563a682554c9f6826ac967d92e9b012 /src/keyboard.c | |
| parent | 2f23b3ab02d48e972fbce7f4a38527e07c651aa0 (diff) | |
| download | emacs-a8a7c5f651cd9c3d354a4cb4938e5289d4cbbe4b.tar.gz emacs-a8a7c5f651cd9c3d354a4cb4938e5289d4cbbe4b.zip | |
* src/eval.c (backtrace_p, backtrace_top, backtrace_next): Export them to
.gdbinit.
* src/data.c (pure_write_error): Add `object' argument.
* src/puresize.h (CHECK_IMPURE): Use it.
* src/keyboard.c (safe_run_hooks_error): Improve error message.
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index a243b95470a..8dd109d252d 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1882,7 +1882,7 @@ safe_run_hooks_error (Lisp_Object error_data) | |||
| 1882 | = CONSP (Vinhibit_quit) ? XCAR (Vinhibit_quit) : Vinhibit_quit; | 1882 | = CONSP (Vinhibit_quit) ? XCAR (Vinhibit_quit) : Vinhibit_quit; |
| 1883 | Lisp_Object fun = CONSP (Vinhibit_quit) ? XCDR (Vinhibit_quit) : Qnil; | 1883 | Lisp_Object fun = CONSP (Vinhibit_quit) ? XCDR (Vinhibit_quit) : Qnil; |
| 1884 | Lisp_Object args[4]; | 1884 | Lisp_Object args[4]; |
| 1885 | args[0] = build_string ("Error in %s (%s): %S"); | 1885 | args[0] = build_string ("Error in %s (%S): %S"); |
| 1886 | args[1] = hook; | 1886 | args[1] = hook; |
| 1887 | args[2] = fun; | 1887 | args[2] = fun; |
| 1888 | args[3] = error_data; | 1888 | args[3] = error_data; |