[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100418: Fix GTK font name parsing
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100418: Fix GTK font name parsing to allow numbers in names (Bug#7853). |
Date: |
Wed, 26 Jan 2011 19:45:30 -0500 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100418
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-01-26 19:45:30 -0500
message:
Fix GTK font name parsing to allow numbers in names (Bug#7853).
A better fix is already in the trunk.
* src/font.c (font_parse_fcname): Require GTK-style font sizes to
occur at the end of the font string (Bug#7853).
modified:
src/ChangeLog
src/font.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-01-26 16:28:49 +0000
+++ b/src/ChangeLog 2011-01-27 00:45:30 +0000
@@ -1,3 +1,8 @@
+2011-01-27 Chong Yidong <address@hidden>
+
+ * font.c (font_parse_fcname): Require GTK-style font sizes to
+ occur at the end of the font string (Bug#7853).
+
2011-01-26 Chong Yidong <address@hidden>
* font.c (font_parse_fcname): Fix typo in string length.
=== modified file 'src/font.c'
--- a/src/font.c 2011-01-26 16:28:49 +0000
+++ b/src/font.c 2011-01-27 00:45:30 +0000
@@ -1549,7 +1549,8 @@
size_found = 0;
break;
}
- if (size_found)
+ /* GTK font sizes must occur at the end. */
+ if (size_found && *q == '\0')
{
double point_size = strtod (p, &q);
ASET (font, FONT_SIZE_INDEX, make_float (point_size));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100418: Fix GTK font name parsing to allow numbers in names (Bug#7853).,
Chong Yidong <=