[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src font.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] emacs/src font.c |
Date: |
Tue, 19 May 2009 02:05:52 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 09/05/19 02:05:52
Modified files:
src : font.c
Log message:
(font_sort_entities): Renamed from font_sort_entites.
Callers changed.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.131&r2=1.132
Patches:
Index: font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- font.c 18 May 2009 12:14:14 -0000 1.131
+++ font.c 19 May 2009 02:05:52 -0000 1.132
@@ -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)