diff options
| author | Kenichi Handa <handa@m17n.org> | 2002-09-27 00:47:25 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2002-09-27 00:47:25 +0000 |
| commit | e21880c69303379f462fa19e6eb386b16c61e5cc (patch) | |
| tree | 75550b6627e662d552b858e73b15bd2210bdf2b0 | |
| parent | 05f829ce2a79e6cb9f1a5ca37e19153b1a5a112a (diff) | |
| download | emacs-e21880c69303379f462fa19e6eb386b16c61e5cc.tar.gz emacs-e21880c69303379f462fa19e6eb386b16c61e5cc.tar.bz2 emacs-e21880c69303379f462fa19e6eb386b16c61e5cc.zip | |
(try_font_list): Pay attention to the case that FAMILY is nil.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfaces.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bae54ef29a7..73abc9bdfa4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-09-27 Kenichi Handa <handa@etl.go.jp> + + * xfaces.c (try_font_list): Pay attention to the case that FAMILY + is nil. + 2002-09-26 Richard M. Stallman <rms@gnu.org> * regex.h (__restrict_arr): Don't define if already defined. diff --git a/src/xfaces.c b/src/xfaces.c index 57749ea5634..d5ddd6b40de 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6343,7 +6343,7 @@ try_font_list (f, attrs, family, registry, fonts, prefer_face_family) Lisp_Object face_family = attrs[LFACE_FAMILY_INDEX]; Lisp_Object try_family; - try_family = prefer_face_family ? face_family : family; + try_family = (prefer_face_family || NILP (family)) ? face_family : family; if (STRINGP (try_family)) nfonts = try_alternative_families (f, try_family, registry, fonts); @@ -6359,7 +6359,7 @@ try_font_list (f, attrs, family, registry, fonts, prefer_face_family) nfonts = try_alternative_families (f, try_family, Qnil, fonts); #endif - if (! prefer_face_family) + if (EQ (try_family, family)) family = face_family; if (nfonts == 0 && STRINGP (family)) |