summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2000-07-14 12:19:02 +0000
committerKenichi Handa <handa@m17n.org>2000-07-14 12:19:02 +0000
commitfc8c47972e9760f487a50dffb2fbef03f05aaa8c (patch)
tree5a721204e19b351be441663f9f3143437436849d /src
parent0693904a97ea817085852c9bfe4e0916384267dc (diff)
downloademacs-fc8c47972e9760f487a50dffb2fbef03f05aaa8c.tar.gz
(realize_x_face): Make fontset using the base of the
default'face's fontset, not using the default fontset.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 30fa8b02be3..91655c8086a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5925,13 +5925,16 @@ realize_x_face (cache, attrs, c, base_face)
else
{
/* If the face attribute ATTRS specifies a fontset, use it as
- the base of a new realized fontset. Otherwise, use the
- default fontset as the base. The base determines registry
- and encoding of a font. It may also determine foundry and
- family. The other fields of font name pattern are
- constructed from ATTRS. */
- face->fontset
- = make_fontset_for_ascii_face (f, face_fontset (attrs));
+ the base of a new realized fontset. Otherwise, use the same
+ base fontset as of the default face. The base determines
+ registry and encoding of a font. It may also determine
+ foundry and family. The other fields of font name pattern
+ are constructed from ATTRS. */
+ int fontset = face_fontset (attrs);
+
+ if (fontset == -1)
+ fontset = default_face->fontset;
+ face->fontset = make_fontset_for_ascii_face (f, fontset);
face->font = NULL; /* to force realize_face to load font */
}