diff options
| author | Kenichi Handa | 2008-06-17 04:50:11 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-06-17 04:50:11 +0000 |
| commit | 70d6ecc654a345dd495a722eda68fb0f94f64472 (patch) | |
| tree | 356848e6f71f3634ff073d3b3551b2a81d628f48 /src | |
| parent | c1473b4cfeb477ced05d457868c5e1eb97a58eb0 (diff) | |
| download | emacs-70d6ecc654a345dd495a722eda68fb0f94f64472.tar.gz emacs-70d6ecc654a345dd495a722eda68fb0f94f64472.zip | |
(realize_default_face): If the frame is not on window
system, set the fontset of face to nil.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfaces.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0eebe5ce290..6e66c7f4743 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-06-17 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * xfaces.c (realize_default_face): If the frame is not on window | ||
| 4 | system, set the fontset of face to nil. | ||
| 5 | |||
| 1 | 2008-06-17 Naohiro Aota <nao.aota@gmail.com> (tiny change) | 6 | 2008-06-17 Naohiro Aota <nao.aota@gmail.com> (tiny change) |
| 2 | 7 | ||
| 3 | * fontset.c (fontset_pattern_regexp): Escape some reg-expr | 8 | * fontset.c (fontset_pattern_regexp): Escape some reg-expr |
diff --git a/src/xfaces.c b/src/xfaces.c index 15d6e6bcbf6..fba5a3ba4f7 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -5587,6 +5587,8 @@ realize_default_face (f) | |||
| 5587 | LFACE_WEIGHT (lface) = Qnormal; | 5587 | LFACE_WEIGHT (lface) = Qnormal; |
| 5588 | if (UNSPECIFIEDP (LFACE_SLANT (lface))) | 5588 | if (UNSPECIFIEDP (LFACE_SLANT (lface))) |
| 5589 | LFACE_SLANT (lface) = Qnormal; | 5589 | LFACE_SLANT (lface) = Qnormal; |
| 5590 | if (UNSPECIFIEDP (LFACE_FONTSET (lface))) | ||
| 5591 | LFACE_FONTSET (lface) = Qnil; | ||
| 5590 | } | 5592 | } |
| 5591 | 5593 | ||
| 5592 | if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) | 5594 | if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) |