From: tomo <tomo>
Date: Mon, 13 Sep 1999 06:52:41 +0000 (+0000)
Subject: (breakup_char_1): Use `Vdefault_coded_charset_priority_list' for
X-Git-Tag: r21-2-19-utf-2000-0_7-0~17
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0b5f627785e9089b21c6555d3c8e6b25b4a0369;p=chise%2Fxemacs-chise.git

(breakup_char_1): Use `Vdefault_coded_charset_priority_list' for
greek-iso8859-7 area.
---

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 86878d7..f8a7145 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -479,7 +479,7 @@ breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2)
 	  *c2 = latin_a_char_to_byte2[c - 0x100];
 	}
     }
-  else if (c < MIN_CHAR_GREEK)
+  else if (c <= MAX_CHAR_GREEK)
     {
       Lisp_Object charsets = Vdefault_coded_charset_priority_list;
       while (!EQ (charsets, Qnil))
@@ -494,15 +494,18 @@ breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2)
 	  charsets = Fcdr (charsets);	      
 	}
       /* otherwise */
-      *charset = Vcharset_ucs_bmp;
-      *c1 = c >> 8;
-      *c2 = c & 0xff;
-    }
-  else if (c <= MAX_CHAR_GREEK)
-    {
-      *charset = Vcharset_greek_iso8859_7;
-      *c1 = c - MIN_CHAR_GREEK + 0x20;
-      *c2 = 0;
+      if (MIN_CHAR_GREEK <= c)
+	{
+	  *charset = Vcharset_greek_iso8859_7;
+	  *c1 = c - MIN_CHAR_GREEK + 0x20;
+	  *c2 = 0;
+	}
+      else
+	{
+	  *charset = Vcharset_ucs_bmp;
+	  *c1 = c >> 8;
+	  *c2 = c & 0xff;
+	}
     }
   else if (c < MIN_CHAR_CYRILLIC)
     {