diff options
| author | Kenichi Handa | 2009-04-21 06:46:39 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2009-04-21 06:46:39 +0000 |
| commit | 908567efed9996f9f7a47124875195c194ad1ab6 (patch) | |
| tree | 628bd9d370d33a25ce1b951d5206499e3f048174 /src | |
| parent | df80c7f014d343a8256136361203b731a95198f9 (diff) | |
| download | emacs-908567efed9996f9f7a47124875195c194ad1ab6.tar.gz emacs-908567efed9996f9f7a47124875195c194ad1ab6.zip | |
(font_load_for_lface): Cancel previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/font.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 378bce3a07b..c066489b680 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2009-04-21 Kenichi Handa <handa@m17n.org> | 1 | 2009-04-21 Kenichi Handa <handa@m17n.org> |
| 2 | 2 | ||
| 3 | * font.c (font_load_for_lface): Cancel previous change. | ||
| 4 | |||
| 3 | * coding.c (decode_coding_utf_16): Reduce charbuf_end for the | 5 | * coding.c (decode_coding_utf_16): Reduce charbuf_end for the |
| 4 | worst case. | 6 | worst case. |
| 5 | (decode_coding_emacs_mule, decode_coding_iso_2022) | 7 | (decode_coding_emacs_mule, decode_coding_iso_2022) |
diff --git a/src/font.c b/src/font.c index d3ebbf54f14..c9f8b3e2d82 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -3437,8 +3437,7 @@ font_load_for_lface (f, attrs, spec) | |||
| 3437 | { | 3437 | { |
| 3438 | Lisp_Object entity; | 3438 | Lisp_Object entity; |
| 3439 | 3439 | ||
| 3440 | /* We assume that a font that supports 'A' supports ASCII chars. */ | 3440 | entity = font_find_for_lface (f, attrs, spec, -1); |
| 3441 | entity = font_find_for_lface (f, attrs, spec, 'A'); | ||
| 3442 | if (NILP (entity)) | 3441 | if (NILP (entity)) |
| 3443 | { | 3442 | { |
| 3444 | /* No font is listed for SPEC, but each font-backend may have | 3443 | /* No font is listed for SPEC, but each font-backend may have |