mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

Merge from origin/emacs-28

Browse Source 
31ef751f94 Clarify documentation of a "face's font"
29bdedf12f Bind Qdebugger to Qdebug in signal_or_quit.
This commit is contained in:
Stefan Kangas 2022-02-01 06:57:16 +01:00
commit 30ebb54410
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
doc/lispref/display.texi
View File

@ -2654,9 +2654,10 @@ used automatically to handle certain shades of gray.
@item :font @item :font
The font used to display the face. Its value should be a font object The font used to display the face. Its value should be a font object
or a fontset. @xref{Low-Level Font}, for information about font or a fontset. If it is a font object, it specifies the font to be
objects, font specs, and font entities. @xref{Fontsets}, for used by the face for displaying ASCII characters. @xref{Low-Level
information about fontsets. Font}, for information about font objects, font specs, and font
entities. @xref{Fontsets}, for information about fontsets.
@anchor{face-font-attribute} @anchor{face-font-attribute}
When specifying this attribute using @code{set-face-attribute} or When specifying this attribute using @code{set-face-attribute} or
@ -3100,13 +3101,19 @@ return value is always specified, use a value of @code{default} for
@var{inherit}. @var{inherit}.
@defun face-font face &optional frame character @defun face-font face &optional frame character
This function returns the name of the font of face @var{face}. This function returns the name of the font used by the specified
@var{face}.
If the optional argument @var{frame} is specified, it returns the name If the optional argument @var{frame} is specified, it returns the name
of the font of @var{face} for that frame. If @var{frame} is omitted or of the font of @var{face} for that frame; @var{frame} defaults to the
@code{nil}, the selected frame is used. In the latter case, if the selected frame if it is @code{nil} or omitted. If @var{frame} is
optional third argument @var{character} is supplied, it returns the font @code{t}, the function reports on the font defaults for @var{face} to
name used for @var{character}. be used for new frames.
By default, the returned font is for displaying ASCII characters, but
if @var{frame} is anything but @code{t}, and the optional third
argument @var{character} is supplied, the function returns the font
name used by @var{face} for that character.
@end defun @end defun
@defun face-foreground face &optional frame inherit @defun face-foreground face &optional frame inherit

3
src/eval.c
View File

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

6
src/xfaces.c
View File

@ -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). 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 The font default for a face is either nil, or a list
of the form (bold), (italic) or (bold italic). of the form (bold), (italic) or (bold italic).
If FRAME is omitted or nil, use the selected frame. And, in this case, If FRAME is omitted or nil, use the selected frame.
if the optional third argument CHARACTER is given, If FRAME is anything but t, and the optional third argument CHARACTER
return the font name used for CHARACTER. */) is given, return the font name used by FACE for CHARACTER on FRAME. */)
(Lisp_Object face, Lisp_Object frame, Lisp_Object character) (Lisp_Object face, Lisp_Object frame, Lisp_Object character)
{ {
if (EQ (frame, Qt)) if (EQ (frame, Qt))