diff options
| author | Jan Djärv | 2010-06-22 08:42:00 +0200 |
|---|---|---|
| committer | Jan Djärv | 2010-06-22 08:42:00 +0200 |
| commit | 32a679fd52520b7003c745548ce484a00a1ec5eb (patch) | |
| tree | 2e641ebda780b894adfc17c1f36d4b95b4657091 | |
| parent | 7f0b7b3e87d46e8b95a914dba3806c86443b57e8 (diff) | |
| download | emacs-32a679fd52520b7003c745548ce484a00a1ec5eb.tar.gz emacs-32a679fd52520b7003c745548ce484a00a1ec5eb.zip | |
* font.c (font_parse_fcname): Allow . for sizes like 7.5 (bug#6437).
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/font.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7405d92e0e6..121d06577b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-06-22 Keith Packard <keithp@keithp.com> (tiny change) | ||
| 2 | |||
| 3 | * font.c (font_parse_fcname): Allow . for sizes like 7.5 (bug#6437). | ||
| 4 | |||
| 1 | 2010-06-20 Eli Zaretskii <eliz@gnu.org> | 5 | 2010-06-20 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (try_scrolling): When scroll-conservatively is set to | 7 | * xdisp.c (try_scrolling): When scroll-conservatively is set to |
diff --git a/src/font.c b/src/font.c index e07dbc5dd16..f9c2381fa70 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -1544,7 +1544,7 @@ font_parse_fcname (name, font) | |||
| 1544 | int size_found = 1; | 1544 | int size_found = 1; |
| 1545 | 1545 | ||
| 1546 | for (q = p + 1; *q && *q != ' '; q++) | 1546 | for (q = p + 1; *q && *q != ' '; q++) |
| 1547 | if (! isdigit (*q)) | 1547 | if (! isdigit (*q) && *q != '.') |
| 1548 | { | 1548 | { |
| 1549 | size_found = 0; | 1549 | size_found = 0; |
| 1550 | break; | 1550 | break; |