aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDima Kogan2015-02-09 15:56:38 +0100
committerJan D2015-02-09 15:56:38 +0100
commitaf560cd6f15e7cc7e42bff5b3c802b9d1d1640b5 (patch)
treec32a5c5ebc47c00b0da6670ce13dda7c7f351c9d /src
parent054dcbab2414e72d7c743214b7c56408fa4912dd (diff)
downloademacs-af560cd6f15e7cc7e42bff5b3c802b9d1d1640b5.tar.gz
emacs-af560cd6f15e7cc7e42bff5b3c802b9d1d1640b5.zip
Remove unused assignment.
* font.c (font_score): Remove unused variable assignment.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/font.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bc5d6101a5c..2a702a29a7d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12015-02-09 Dima Kogan <dima@secretsauce.net> 12015-02-09 Dima Kogan <dima@secretsauce.net>
2 2
3 * font.c (font_score): Remove unused variable assignment.
4
52015-02-09 Dima Kogan <dima@secretsauce.net>
6
3 * xfaces.c (realize_basic_faces): Don't set Qscalable_fonts_allowed to 7 * xfaces.c (realize_basic_faces): Don't set Qscalable_fonts_allowed to
4 t. 8 t.
5 * font.c (font_score): Try to find a font without scaling first, 9 * font.c (font_score): Try to find a font without scaling first,
diff --git a/src/font.c b/src/font.c
index 9ea43cdfc85..b2b43c79713 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2136,7 +2136,6 @@ font_score (Lisp_Object entity, Lisp_Object *spec_prop)
2136 } 2136 }
2137 2137
2138 /* Score the size. Maximum difference is 127. */ 2138 /* Score the size. Maximum difference is 127. */
2139 i = FONT_SIZE_INDEX;
2140 if (! NILP (spec_prop[FONT_SIZE_INDEX]) 2139 if (! NILP (spec_prop[FONT_SIZE_INDEX])
2141 && XINT (AREF (entity, FONT_SIZE_INDEX)) > 0) 2140 && XINT (AREF (entity, FONT_SIZE_INDEX)) > 0)
2142 { 2141 {