diff options
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/font.c b/src/font.c index cb27155f09d..64ac36d364c 100644 --- a/src/font.c +++ b/src/font.c @@ -614,7 +614,7 @@ static const struct /* Function to validate PROP's value VAL, or NULL if any value is ok. The value is VAL or its regularized value if VAL is valid, and Qerror if not. */ - Lisp_Object (*validater) (Lisp_Object prop, Lisp_Object val); + Lisp_Object (*validator) (Lisp_Object prop, Lisp_Object val); } font_property_table[] = { { &QCtype, font_prop_validate_symbol }, { &QCfoundry, font_prop_validate_symbol }, @@ -672,7 +672,7 @@ font_prop_validate (int idx, Lisp_Object prop, Lisp_Object val) if (idx < 0) return val; } - validated = (font_property_table[idx].validater) (prop, val); + validated = (font_property_table[idx].validator) (prop, val); if (EQ (validated, Qerror)) signal_error ("invalid font property", Fcons (prop, val)); return validated; @@ -825,7 +825,7 @@ font_expand_wildcards (Lisp_Object *field, int n) range_mask = (range_mask << 1) | 1; /* The triplet RANGE_FROM, RANGE_TO, and RANGE_MASK is a - position-based retriction for FIELD[I]. */ + position-based restriction for FIELD[I]. */ for (i = 0, range_from = 0, range_to = 14 - n; i < n; i++, range_from++, range_to++, range_mask <<= 1) { @@ -842,7 +842,7 @@ font_expand_wildcards (Lisp_Object *field, int n) else { /* The triplet FROM, TO, and MASK is a value-based - retriction for FIELD[I]. */ + restriction for FIELD[I]. */ int from, to; unsigned mask; @@ -3162,14 +3162,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c) else { Lisp_Object alters - = Fassoc_string (val, Vface_alternative_font_family_alist, - /* Font family names are case-sensitive under NS. */ -#ifndef HAVE_NS - Qt -#else - Qnil -#endif - ); + = Fassoc_string (val, Vface_alternative_font_family_alist, Qt); if (! NILP (alters)) { |