diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-10 07:39:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-10 07:39:05 -0700 |
| commit | 46b83c0f08f936eb1a0ae761db557169fe295cc7 (patch) | |
| tree | bdb663d86a908a83b7c953316d04714664b32a0c /src/fontset.c | |
| parent | be589ea0dc71063d26595378df303a2a1c25ee4e (diff) | |
| parent | 4f406e9813e073b675bb45613bf1dd111eec2368 (diff) | |
| download | emacs-46b83c0f08f936eb1a0ae761db557169fe295cc7.tar.gz | |
Merge from origin/emacs-25
4f406e9 CC Mode manual: remove reference to former Emacs variable las...
44e402e Allow to disable compaction of font caches
4ff4b66 Allow selection of font for symbols as in Emacs 24.x
c03d44b ; Fix last commit
d4be4f3 ; Fix indexing in lispref manual
ed399f2 ; Minor improvement in documentation of generators
197a6bc Fix horizontal scrolling during Isearch
3566644 Fix infloop in redisplay due to truncated lines and invisible...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/fontset.c b/src/fontset.c index fe595d81a3e..38ff780ccba 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -921,7 +921,8 @@ face_for_char (struct frame *f, struct face *face, int c, if (ASCII_CHAR_P (c) || CHAR_BYTE8_P (c)) return face->ascii_face->id; - if (c > 0 && EQ (CHAR_TABLE_REF (Vchar_script_table, c), Qsymbol)) + if (use_default_font_for_symbols /* let the user disable this feature */ + && c > 0 && EQ (CHAR_TABLE_REF (Vchar_script_table, c), Qsymbol)) { /* Fonts often have characters for punctuation and other symbols, even if they don't match the 'symbol' script. So @@ -2150,6 +2151,16 @@ This affects how a composite character which contains such a character is displayed on screen. */); Vuse_default_ascent = Qnil; + DEFVAR_BOOL ("use-default-font-for-symbols", use_default_font_for_symbols, + doc: /* +If non-nil, use the default face's font for symbols and punctuation. + +By default, Emacs will try to use the default face's font for +displaying symbol and punctuation characters, disregarding the +fontsets, if the default font can display the character. +Set this to nil to make Emacs honor the fontsets instead. */); + use_default_font_for_symbols = 1; + DEFVAR_LISP ("ignore-relative-composition", Vignore_relative_composition, doc: /* Char table of characters which are not composed relatively. |