From 74d65029b1ffb09ced9db1a62a85214579ff28cb Mon Sep 17 00:00:00 2001 From: tomo Date: Mon, 13 Sep 1999 17:35:28 +0000 Subject: [PATCH] (breakup_char_1): Use `Vdefault_coded_charset_priority_list' for cyrillic-iso8859-5 area. --- src/char-ucs.h | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/char-ucs.h b/src/char-ucs.h index ce63c10..10ab6f1 100644 --- 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 <= MAX_CHAR_GREEK) + if (c < MIN_CHAR_HEBREW) { Lisp_Object charsets = Vdefault_coded_charset_priority_list; while (!EQ (charsets, Qnil)) @@ -455,6 +455,12 @@ breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) *c1 = c - MIN_CHAR_GREEK + 0x20; *c2 = 0; } + else if ((MIN_CHAR_CYRILLIC <= c) && (c <= MAX_CHAR_CYRILLIC)) + { + *charset = Vcharset_cyrillic_iso8859_5; + *c1 = c - MIN_CHAR_CYRILLIC + 0x20; + *c2 = 0; + } else { *charset = Vcharset_ucs_bmp; @@ -462,24 +468,6 @@ breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) *c2 = c & 0xff; } } - else if (c < MIN_CHAR_CYRILLIC) - { - *charset = Vcharset_ucs_bmp; - *c1 = c >> 8; - *c2 = c & 0xff; - } - else if (c <= MAX_CHAR_CYRILLIC) - { - *charset = Vcharset_cyrillic_iso8859_5; - *c1 = c - MIN_CHAR_CYRILLIC + 0x20; - *c2 = 0; - } - else if (c < MIN_CHAR_HEBREW) - { - *charset = Vcharset_ucs_bmp; - *c1 = c >> 8; - *c2 = c & 0xff; - } else if (c <= MAX_CHAR_HEBREW) { *charset = Vcharset_hebrew_iso8859_8; -- 1.7.10.4