From: tomo Date: Tue, 4 Oct 2011 17:33:54 +0000 (+0000) Subject: (charset_code_point): If nil is specified as a feature-value, don't X-Git-Tag: r21-4-22-chise-0_25-10^20~95 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d44aa490c9d10be554cb8ec7454eb04684dde2;p=chise%2Fxemacs-chise.git (charset_code_point): If nil is specified as a feature-value, don't find in mother and return -1. --- diff --git a/src/mule-charset.c b/src/mule-charset.c index 1c91eb8..a60e790 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -1149,9 +1149,12 @@ charset_code_point (Lisp_Object charset, Emchar ch, int accepted_mode) Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (charset); if ( CHAR_TABLEP (encoding_table) - && INTP (ret = get_char_id_table (XCHAR_TABLE(encoding_table), - ch)) ) - return XINT (ret); + && !UNBOUNDP (ret = get_char_id_table (XCHAR_TABLE(encoding_table), + ch)) ) + if ( INTP (ret) ) + return XINT (ret); + else + return -1; } { Lisp_Object mother = XCHARSET_MOTHER (charset);