Merge from origin/emacs-28

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

2 files changed, 5 insertions, 4 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;
diff --git a/src/xfaces.c b/src/xfaces.c
index 6a279f87192..76ce6932023 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4151,9 +4151,9 @@ If the optional argument FRAME is given, report on face FACE in that frame.
 If FRAME is t, report on the defaults for face FACE (for new frames).
   The font default for a face is either nil, or a list
   of the form (bold), (italic) or (bold italic).
-If FRAME is omitted or nil, use the selected frame.  And, in this case,
-if the optional third argument CHARACTER is given,
-return the font name used for CHARACTER.  */)
+If FRAME is omitted or nil, use the selected frame.
+If FRAME is anything but t, and the optional third argument CHARACTER
+is given, return the font name used by FACE for CHARACTER on FRAME.  */)
   (Lisp_Object face, Lisp_Object frame, Lisp_Object character)
 {
   if (EQ (frame, Qt))