From: tomo <tomo>
Date: Fri, 16 Nov 2001 08:13:53 +0000 (+0000)
Subject: (Fcharset_property): Return Qnil if CHARSET_FINAL (cs) == 0.
X-Git-Tag: r21-2-43-utf-2000-0_18-1~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=dd79dd809ce86993b276faf6359adecf9f60ee76;p=chise%2Fxemacs-chise.git

(Fcharset_property): Return Qnil if CHARSET_FINAL (cs) == 0.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index e8d4e2e..e592ad4 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -1850,7 +1850,8 @@ Recognized properties are those listed in `make-charset', as well as
   if (EQ (prop, Qdimension))   return make_int (CHARSET_DIMENSION (cs));
   if (EQ (prop, Qcolumns))     return make_int (CHARSET_COLUMNS (cs));
   if (EQ (prop, Qgraphic))     return make_int (CHARSET_GRAPHIC (cs));
-  if (EQ (prop, Qfinal))       return make_char (CHARSET_FINAL (cs));
+  if (EQ (prop, Qfinal))       return CHARSET_FINAL (cs) == 0 ?
+				 Qnil : make_char (CHARSET_FINAL (cs));
   if (EQ (prop, Qchars))       return make_int (CHARSET_CHARS (cs));
   if (EQ (prop, Qregistry))    return CHARSET_REGISTRY (cs);
   if (EQ (prop, Qccl_program)) return CHARSET_CCL_PROGRAM (cs);