Mercurial > emacs
changeset 40598:7f3db64c7d42
(Finternal_merge_in_global_face): Reindent.
(Fface_font): Ditto.
(Finternal_set_alternative_font_registry_alist): Ditto.
(Ftty_suppress_bold_inverse_default_colors): Ditto.
author | Pavel Janík <Pavel@Janik.cz> |
---|---|
date | Thu, 01 Nov 2001 07:04:02 +0000 |
parents | 8a3401d69e10 |
children | e564ab2ef09f |
files | src/xfaces.c |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Thu Nov 01 07:00:20 2001 +0000 +++ b/src/xfaces.c Thu Nov 01 07:04:02 2001 +0000 @@ -4637,7 +4637,7 @@ DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face, Sinternal_merge_in_global_face, 2, 2, 0, - doc: /* Add attributes from frame-default definition of FACE to FACE on FRAME. + doc: /* Add attributes from frame-default definition of FACE to FACE on FRAME. Default face attributes override any local face attributes. */) (face, frame) Lisp_Object face, frame; @@ -4672,7 +4672,7 @@ done in fontset.el. */ DEFUN ("face-font", Fface_font, Sface_font, 1, 2, 0, - doc: /* Return the font name of face FACE, or nil if it is unspecified. + doc: /* Return the font name of face FACE, or nil if it is unspecified. 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 @@ -5588,7 +5588,7 @@ DEFUN ("internal-set-alternative-font-registry-alist", Finternal_set_alternative_font_registry_alist, Sinternal_set_alternative_font_registry_alist, 1, 1, 0, - doc: /* Define alternative font registries to try in face font selection. + doc: /* Define alternative font registries to try in face font selection. ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries. Each ALTERNATIVE is tried in order if no fonts of font registry REGISTRY can be found. Value is ALIST. */) @@ -6694,7 +6694,7 @@ DEFUN ("tty-suppress-bold-inverse-default-colors", Ftty_suppress_bold_inverse_default_colors, Stty_suppress_bold_inverse_default_colors, 1, 1, 0, - doc: /* Suppress/allow boldness of faces with inverse default colors. + doc: /* Suppress/allow boldness of faces with inverse default colors. SUPPRESS non-nil means suppress it. This affects bold faces on TTYs whose foreground is the default background color of the display and whose background is the default foreground color.