diff options
| author | Kenichi Handa | 2004-01-07 00:24:44 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2004-01-07 00:24:44 +0000 |
| commit | 9da88f37868c461a5d9fffb5717b6b3b953d1367 (patch) | |
| tree | 2ae7d9512586138d481fc69b1bc82cfc2578f9fa /src | |
| parent | 722ae5f43b6a4877a11564df305c98ed6e4dad5a (diff) | |
| download | emacs-9da88f37868c461a5d9fffb5717b6b3b953d1367.tar.gz emacs-9da88f37868c461a5d9fffb5717b6b3b953d1367.zip | |
(fontset_ref_via_base): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fontset.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 78738b194c5..95000060b06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-01-07 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * fontset.c (fontset_ref_via_base): Fix previous change. | ||
| 4 | |||
| 1 | 2004-01-07 Kim F. Storm <storm@cua.dk> | 5 | 2004-01-07 Kim F. Storm <storm@cua.dk> |
| 2 | 6 | ||
| 3 | * process.c (read_process_output): Only activate adaptive | 7 | * process.c (read_process_output): Only activate adaptive |
diff --git a/src/fontset.c b/src/fontset.c index b199f53df17..402561db005 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -305,7 +305,7 @@ fontset_ref_via_base (fontset, c) | |||
| 305 | elt = FONTSET_REF (FONTSET_BASE (fontset), *c); | 305 | elt = FONTSET_REF (FONTSET_BASE (fontset), *c); |
| 306 | if (NILP (elt)) | 306 | if (NILP (elt)) |
| 307 | elt = lookup_overriding_fontspec (FONTSET_FRAME (fontset), *c); | 307 | elt = lookup_overriding_fontspec (FONTSET_FRAME (fontset), *c); |
| 308 | if (NILP (elt) && ! EQ (FONTSET_BASE (fontset), Vdefault_fontset)) | 308 | if (NILP (elt)) |
| 309 | elt = FONTSET_REF (Vdefault_fontset, *c); | 309 | elt = FONTSET_REF (Vdefault_fontset, *c); |
| 310 | if (NILP (elt)) | 310 | if (NILP (elt)) |
| 311 | return Qnil; | 311 | return Qnil; |