# HG changeset patch # User Kenichi Handa # Date 1242698752 0 # Node ID a8e08bcfc3adbbbf24575272fd7a8bc934060900 # Parent cbea58d660d257dfcedafa59383b1a3bece800bb (font_sort_entities): Renamed from font_sort_entites. Callers changed. diff -r cbea58d660d2 -r a8e08bcfc3ad src/font.c --- a/src/font.c Tue May 19 01:46:13 2009 +0000 +++ b/src/font.c Tue May 19 02:05:52 2009 +0000 @@ -2178,7 +2178,7 @@ static unsigned font_score P_ ((Lisp_Object, Lisp_Object *)); static int font_compare P_ ((const void *, const void *)); -static Lisp_Object font_sort_entites P_ ((Lisp_Object, Lisp_Object, +static Lisp_Object font_sort_entities P_ ((Lisp_Object, Lisp_Object, Lisp_Object, int)); /* Return a rescaling ratio of FONT_ENTITY. */ @@ -2311,7 +2311,7 @@ VEC is 1. The caller should avoid calling this in such a case. */ static Lisp_Object -font_sort_entites (vec, prefer, frame, best_only) +font_sort_entities (vec, prefer, frame, best_only) Lisp_Object vec, prefer, frame; int best_only; { @@ -3222,7 +3222,7 @@ FONT_SET_STYLE (prefer, FONT_WIDTH_INDEX, attrs[LFACE_SWIDTH_INDEX]); ASET (prefer, FONT_SIZE_INDEX, make_number (pixel_size)); - return font_sort_entites (entities, prefer, frame, c); + return font_sort_entities (entities, prefer, frame, c); } /* Return a font-entity satisfying SPEC and best matching with face's @@ -4261,7 +4261,7 @@ return Fcons (AREF (vec, 0), Qnil); if (! NILP (prefer)) - vec = font_sort_entites (vec, prefer, frame, 0); + vec = font_sort_entities (vec, prefer, frame, 0); list = tail = Fcons (AREF (vec, 0), Qnil); if (n == 0 || n > len)