[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: |
Wed, 10 Jun 2009 01:26:16 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 09/06/10 01:26:16
Modified files:
src : font.c
Log message:
(font_parse_family_registry): Fix for one-char foundry.
(font_sort_entities): Initialize prefer_prop[FONT_AVGWIDTH_INDEX].
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.132&r2=1.133
Patches:
Index: font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- font.c 19 May 2009 02:05:52 -0000 1.132
+++ font.c 10 Jun 2009 01:26:15 -0000 1.133
@@ -1844,7 +1844,7 @@
p1 = index (p0, '-');
if (p1)
{
- if ((*p0 != '*' || p1 - p0 > 1)
+ if ((*p0 != '*' && p1 - p0 > 0)
&& NILP (AREF (font_spec, FONT_FOUNDRY_INDEX)))
Ffont_put (font_spec, QCfoundry, font_intern_prop (p0, p1 - p0, 1));
p1++;
@@ -2326,7 +2326,7 @@
USE_SAFE_ALLOCA;
len = ASIZE (vec);
- for (i = FONT_WEIGHT_INDEX; i <= FONT_DPI_INDEX; i++)
+ for (i = FONT_WEIGHT_INDEX; i <= FONT_AVGWIDTH_INDEX; i++)
prefer_prop[i] = AREF (prefer, i);
if (FLOATP (prefer_prop[FONT_SIZE_INDEX]))
prefer_prop[FONT_SIZE_INDEX]
- [Emacs-diffs] emacs/src font.c,
Kenichi Handa <=