diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/font.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/font.c b/src/font.c index 9095d05cd33..5adec3e1193 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -2178,7 +2178,7 @@ font_otf_Anchor (anchor) | |||
| 2178 | 2178 | ||
| 2179 | static unsigned font_score P_ ((Lisp_Object, Lisp_Object *)); | 2179 | static unsigned font_score P_ ((Lisp_Object, Lisp_Object *)); |
| 2180 | static int font_compare P_ ((const void *, const void *)); | 2180 | static int font_compare P_ ((const void *, const void *)); |
| 2181 | static Lisp_Object font_sort_entites P_ ((Lisp_Object, Lisp_Object, | 2181 | static Lisp_Object font_sort_entities P_ ((Lisp_Object, Lisp_Object, |
| 2182 | Lisp_Object, int)); | 2182 | Lisp_Object, int)); |
| 2183 | 2183 | ||
| 2184 | /* Return a rescaling ratio of FONT_ENTITY. */ | 2184 | /* Return a rescaling ratio of FONT_ENTITY. */ |
| @@ -2311,7 +2311,7 @@ struct font_sort_data | |||
| 2311 | VEC is 1. The caller should avoid calling this in such a case. */ | 2311 | VEC is 1. The caller should avoid calling this in such a case. */ |
| 2312 | 2312 | ||
| 2313 | static Lisp_Object | 2313 | static Lisp_Object |
| 2314 | font_sort_entites (vec, prefer, frame, best_only) | 2314 | font_sort_entities (vec, prefer, frame, best_only) |
| 2315 | Lisp_Object vec, prefer, frame; | 2315 | Lisp_Object vec, prefer, frame; |
| 2316 | int best_only; | 2316 | int best_only; |
| 2317 | { | 2317 | { |
| @@ -3222,7 +3222,7 @@ font_select_entity (frame, entities, attrs, pixel_size, c) | |||
| 3222 | FONT_SET_STYLE (prefer, FONT_WIDTH_INDEX, attrs[LFACE_SWIDTH_INDEX]); | 3222 | FONT_SET_STYLE (prefer, FONT_WIDTH_INDEX, attrs[LFACE_SWIDTH_INDEX]); |
| 3223 | ASET (prefer, FONT_SIZE_INDEX, make_number (pixel_size)); | 3223 | ASET (prefer, FONT_SIZE_INDEX, make_number (pixel_size)); |
| 3224 | 3224 | ||
| 3225 | return font_sort_entites (entities, prefer, frame, c); | 3225 | return font_sort_entities (entities, prefer, frame, c); |
| 3226 | } | 3226 | } |
| 3227 | 3227 | ||
| 3228 | /* Return a font-entity satisfying SPEC and best matching with face's | 3228 | /* Return a font-entity satisfying SPEC and best matching with face's |
| @@ -4261,7 +4261,7 @@ how close they are to PREFER. */) | |||
| 4261 | return Fcons (AREF (vec, 0), Qnil); | 4261 | return Fcons (AREF (vec, 0), Qnil); |
| 4262 | 4262 | ||
| 4263 | if (! NILP (prefer)) | 4263 | if (! NILP (prefer)) |
| 4264 | vec = font_sort_entites (vec, prefer, frame, 0); | 4264 | vec = font_sort_entities (vec, prefer, frame, 0); |
| 4265 | 4265 | ||
| 4266 | list = tail = Fcons (AREF (vec, 0), Qnil); | 4266 | list = tail = Fcons (AREF (vec, 0), Qnil); |
| 4267 | if (n == 0 || n > len) | 4267 | if (n == 0 || n > len) |