From: Kenichi Handa <handa@m17n.org>
Date: Mon, 13 May 2002 13:06:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~901
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b2b3bb62eac2eb65ba9e7a429db253349fd441d5;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bace48f89e..84fef9ae20c 100644
--- 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 e60f5c8fd79..89a5fb2096e 100644
--- 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 bf34746cf90..3cb61a542c3 100644
--- 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.