diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-08-25 14:27:17 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-08-25 14:28:26 -0700 |
| commit | 375e87409a3a016615db6a1bc67ac143d39254d9 (patch) | |
| tree | 3d7169c19723bd3f749b4a13b266de54c964f19d /src/ftfont.c | |
| parent | 9c011a1083c2a78e2fdfe931988ab53f42323a9c (diff) | |
| download | emacs-375e87409a3a016615db6a1bc67ac143d39254d9.tar.gz | |
Omit "V" at the start of DEFVAR_BOOL vars
Problem noted by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2020-08/msg00846.html
* src/font.c (xft_ignore_color_fonts):
* src/syntax.c (comment_end_can_be_escaped):
* src/xdisp.c (word_wrap_by_category, display_fill_column_indicator):
Rename these DEFVAR_BOOL variables to avoid the initial "V"
that wrongly suggests that they are Lisp_Object variables.
All uses changed.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index a904007a329..6fca9c85093 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -768,7 +768,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots #if defined HAVE_XFT && defined FC_COLOR /* We really don't like color fonts, they cause Xft crashes. See Bug#30874. */ - if (Vxft_ignore_color_fonts + if (xft_ignore_color_fonts && ! FcPatternAddBool (pattern, FC_COLOR, FcFalse)) goto err; #endif @@ -911,7 +911,7 @@ ftfont_list (struct frame *f, Lisp_Object spec) returns them even when it shouldn't really do so, so we need to manually skip them here (Bug#37786). */ FcBool b; - if (Vxft_ignore_color_fonts + if (xft_ignore_color_fonts && FcPatternGetBool (fontset->fonts[i], FC_COLOR, 0, &b) == FcResultMatch && b != FcFalse) continue; |