# HG changeset patch # User Kenichi Handa # Date 1021295185 0 # Node ID 3667d64a178704b5eed59f9a076b88cbb44f1ddb # Parent b6df31da4a9ed9a5db85aeb78f578f1d096e8887 *** empty log message *** diff -r b6df31da4a9e -r 3667d64a1787 lisp/ChangeLog --- a/lisp/ChangeLog Mon May 13 13:01:22 2002 +0000 +++ b/lisp/ChangeLog Mon May 13 13:06:25 2002 +0000 @@ -1,3 +1,8 @@ +2002-05-13 Kenichi Handa + + * international/fontset.el (fontset-plain-name): Handle the case + that size, weight, slant are not specified in the fontset name. + 2002-05-10 Yong Lu * language/greek.el (greek-iso-8bit): Fix typo. diff -r b6df31da4a9e -r 3667d64a1787 lisp/international/fontset.el --- a/lisp/international/fontset.el Mon May 13 13:01:22 2002 +0000 +++ b/lisp/international/fontset.el Mon May 13 13:06:25 2002 +0000 @@ -415,7 +415,7 @@ (if (not (string-match "^fontset-\\(.*\\)$" nickname)) fontset (setq nickname (match-string 1 nickname)) - (if (and (integerp size) (> (string-to-int size) 0)) + (if (and size (> (string-to-int size) 0)) (setq name (format "%s: %s-dot" nickname size)) (setq name nickname)) (and weight diff -r b6df31da4a9e -r 3667d64a1787 src/ChangeLog --- a/src/ChangeLog Mon May 13 13:01:22 2002 +0000 +++ b/src/ChangeLog Mon May 13 13:06:25 2002 +0000 @@ -1,3 +1,8 @@ +2002-05-13 Kenichi Handa + + * fontset.c (free_realized_fontsets): Call Fclear_face_cache instead + of calling free_reazlied_face. + 2002-05-10 Yong Lu * charset.c (load_charset_map): Fix previous change.