diff options
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/fontset.c b/src/fontset.c index 8d58f4cee9a..be8ff1bd0eb 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -191,14 +191,6 @@ static int next_fontset_id; font for each character. */ static Lisp_Object Vdefault_fontset; -Lisp_Object Vfont_encoding_charset_alist; -Lisp_Object Vuse_default_ascent; -Lisp_Object Vignore_relative_composition; -Lisp_Object Valternate_fontname_alist; -Lisp_Object Vfontset_alias_alist; -Lisp_Object Vvertical_centering_font_regexp; -Lisp_Object Votf_script_alist; - /* Check if any window system is used now. */ void (*check_window_system_func) (void); @@ -2199,7 +2191,7 @@ syms_of_fontset (void) auto_fontset_alist = Qnil; staticpro (&auto_fontset_alist); - DEFVAR_LISP ("font-encoding-charset-alist", &Vfont_encoding_charset_alist, + DEFVAR_LISP ("font-encoding-charset-alist", Vfont_encoding_charset_alist, doc: /* Alist of charsets vs the charsets to determine the preferred font encoding. Each element looks like (CHARSET . ENCODING-CHARSET), @@ -2210,7 +2202,7 @@ When a text has a property `charset' and the value is CHARSET, a font whose encoding corresponds to ENCODING-CHARSET is preferred. */); Vfont_encoding_charset_alist = Qnil; - DEFVAR_LISP ("use-default-ascent", &Vuse_default_ascent, + DEFVAR_LISP ("use-default-ascent", Vuse_default_ascent, doc: /* Char table of characters whose ascent values should be ignored. If an entry for a character is non-nil, the ascent value of the glyph @@ -2220,7 +2212,7 @@ This affects how a composite character which contains such a character is displayed on screen. */); Vuse_default_ascent = Qnil; - DEFVAR_LISP ("ignore-relative-composition", &Vignore_relative_composition, + DEFVAR_LISP ("ignore-relative-composition", Vignore_relative_composition, doc: /* Char table of characters which are not composed relatively. If an entry for a character is non-nil, a composition sequence @@ -2229,26 +2221,26 @@ the glyph of that character is put without considering an ascent and descent value of a previous character. */); Vignore_relative_composition = Qnil; - DEFVAR_LISP ("alternate-fontname-alist", &Valternate_fontname_alist, + DEFVAR_LISP ("alternate-fontname-alist", Valternate_fontname_alist, doc: /* Alist of fontname vs list of the alternate fontnames. When a specified font name is not found, the corresponding alternate fontnames (if any) are tried instead. */); Valternate_fontname_alist = Qnil; - DEFVAR_LISP ("fontset-alias-alist", &Vfontset_alias_alist, + DEFVAR_LISP ("fontset-alias-alist", Vfontset_alias_alist, doc: /* Alist of fontset names vs the aliases. */); Vfontset_alias_alist = Fcons (Fcons (FONTSET_NAME (Vdefault_fontset), make_pure_c_string ("fontset-default")), Qnil); DEFVAR_LISP ("vertical-centering-font-regexp", - &Vvertical_centering_font_regexp, + Vvertical_centering_font_regexp, doc: /* *Regexp matching font names that require vertical centering on display. When a character is displayed with such fonts, the character is displayed at the vertical center of lines. */); Vvertical_centering_font_regexp = Qnil; - DEFVAR_LISP ("otf-script-alist", &Votf_script_alist, + DEFVAR_LISP ("otf-script-alist", Votf_script_alist, doc: /* Alist of OpenType script tags vs the corresponding script names. */); Votf_script_alist = Qnil; |