*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bace48f89e19322f230ef9122698cc20c1555b9..84fef9ae20cc9bde006e4e1bf37ecd7494895a14 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-13  Kenichi Handa  <handa@etl.go.jp>
+
+       * 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 <lyongu@asia-infonet.com>
 
        * language/greek.el (greek-iso-8bit): Fix typo.

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index e60f5c8fd7953b3c06c9c2e5416b009e961b9c4e..89a5fb2096ee03a8eb327ca848ac9314b7aa3a85 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -415,7 +415,7 @@ with \"fontset\" in `<CHARSET_REGISTRY> field."
          (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 --git a/src/ChangeLog b/src/ChangeLog
index bf34746cf90aadc73077651cfaa01ea146486fac..3cb61a542c3f9f80533f711b2539ccc4f5405075 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-13  Kenichi Handa  <handa@etl.go.jp>
+
+       * fontset.c (free_realized_fontsets): Call Fclear_face_cache instead
+       of calling free_reazlied_face.
+
 2002-05-10  Yong Lu <lyongu@asia-infonet.com>
 
        * charset.c (load_charset_map): Fix previous change.