aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhilippe Vaucher2016-10-04 17:34:51 +0300
committerEli Zaretskii2016-10-04 17:34:51 +0300
commitf2144eef19611fb2189c44c055e1d539b7a53f08 (patch)
treec237bdd9449d4c06c511f194bfc210cf5acfde85 /src
parentec6e4b9d1e5a215d9dfe1026730dbb23f1935615 (diff)
downloademacs-f2144eef19611fb2189c44c055e1d539b7a53f08.tar.gz
emacs-f2144eef19611fb2189c44c055e1d539b7a53f08.zip
Restore 'command-debug-status' functionality
* src/callint.c (Fcall_interactively): Bind command-debug-status to nil. This restores functionality inadvertently removed in Emacs 25.1. (Bug#24555) * lisp/subr.el (command-debug-status): Declare obsolete. * doc/lispref/debugging.texi (Internals of Debugger): Document that 'command-debug-status' is obsolete.
Diffstat (limited to 'src')
-rw-r--r--src/callint.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/callint.c b/src/callint.c
index 053ee6cdaa5..c0afc7b20bd 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -837,7 +837,10 @@ invoke it. If KEYS is omitted or nil, the return value of
837 kset_last_command (current_kboard, save_last_command); 837 kset_last_command (current_kboard, save_last_command);
838 838
839 { 839 {
840 Lisp_Object val = Ffuncall (nargs, args); 840 Lisp_Object val;
841 specbind (Qcommand_debug_status, Qnil);
842
843 val = Ffuncall (nargs, args);
841 val = unbind_to (speccount, val); 844 val = unbind_to (speccount, val);
842 SAFE_FREE (); 845 SAFE_FREE ();
843 return val; 846 return val;
@@ -894,6 +897,7 @@ syms_of_callint (void)
894 DEFSYM (Qhandle_shift_selection, "handle-shift-selection"); 897 DEFSYM (Qhandle_shift_selection, "handle-shift-selection");
895 DEFSYM (Qread_number, "read-number"); 898 DEFSYM (Qread_number, "read-number");
896 DEFSYM (Qfuncall_interactively, "funcall-interactively"); 899 DEFSYM (Qfuncall_interactively, "funcall-interactively");
900 DEFSYM (Qcommand_debug_status, "command-debug-status");
897 DEFSYM (Qenable_recursive_minibuffers, "enable-recursive-minibuffers"); 901 DEFSYM (Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
898 DEFSYM (Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook"); 902 DEFSYM (Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook");
899 903