Merge from origin/emacs-28

31ef751f94 Clarify documentation of a "face's font"
29bdedf12f Bind Qdebugger to Qdebug in signal_or_quit.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/eval.c b/src/eval.c
index 1076985d097..4e8a4e9d9da 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1884,7 +1884,7 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool keyboard_quit)
       && NILP (Vinhibit_debugger))
     {
       ptrdiff_t count = SPECPDL_INDEX ();
-      specbind (Vdebugger, Qdebug);
+      specbind (Qdebugger, Qdebug);
       call_debugger (list2 (Qerror, Fcons (error_symbol, data)));
       unbind_to (count, Qnil);
     }
@@ -4460,6 +4460,7 @@ might not be safe to continue.  */);
                doc: /* Non-nil means display call stack frames as lists. */);
   debugger_stack_frame_as_list = 0;
 
+  DEFSYM (Qdebugger, "debugger");
   DEFVAR_LISP ("debugger", Vdebugger,
                doc: /* Function to call to invoke debugger.
 If due to frame exit, args are `exit' and the value being returned;