From: tomo <tomo>
Date: Tue, 9 Nov 1999 11:34:17 +0000 (+0000)
Subject: (SPLIT_CHAR): Don't make new cell if a charset slot is found.
X-Git-Tag: r21-2-19-utf-2000-0_11-0~16
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=61011fe65e02e28fcff91958e774ae14503387bb;p=chise%2Fxemacs-chise.git.1

(SPLIT_CHAR): Don't make new cell if a charset slot is found.
---

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 6c51a89..7163c9e 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -488,8 +488,9 @@ SPLIT_CHAR (Emchar c)
 
 	  if (!EQ (charset, Qnil))
 	    {
-	      if (!EQ (field = Fcdr (Fassq (charset, cdef)), Qnil) ||
-		  !EQ (field = range_charset_code_point (charset, c), Qnil))
+	      if (!NILP (field = Fassq (charset, cdef)))
+		return field;
+	      else if (!NILP (field = range_charset_code_point (charset, c)))
 		return Fcons (charset, field);
 	    }
 	  charsets = Fcdr (charsets);