(breakup_char_1): Concatenate code for (c < 0x17F) and (c <

MIN_CHAR_GREEK).

diff --git a/src/char-ucs.h b/src/char-ucs.h
index cd7b278..d45683a 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -416,7 +416,7 @@ INLINE void breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2);
 INLINE void
 breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2)
 {
-  if (c < 0x17F)
+  if (c < MIN_CHAR_GREEK)
     {
       Lisp_Object charsets = Vdefault_coded_charset_priority_list;
       while (!EQ (charsets, Qnil))
@@ -456,25 +456,6 @@ breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2)
          *c2 = c & 0xff;
        }
     }
-  else if (c < MIN_CHAR_GREEK)
-    {
-      Lisp_Object charsets = Vdefault_coded_charset_priority_list;
-      while (!EQ (charsets, Qnil))
-       {
-         *charset = Ffind_charset (Fcar (charsets));
-         if (!EQ (*charset, Qnil)
-             && (*c1 = charset_get_byte1 (*charset, c)) )
-           {
-             *c2 = charset_get_byte2 (*charset, c);
-             return;
-           }
-         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;