X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/5c62d133468c354b47a1643092add8292e084765..c805dec0b5fa81b5c9f2b724e2ec12a17d723aca:/src/composite.c

diff --git a/src/composite.c b/src/composite.c
index 796c5a58de..7123b505e6 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -976,9 +976,8 @@ static int _work_char;
   ((C) > ' '								\
    && ((C) == 0x200C || (C) == 0x200D					\
        || (_work_val = CHAR_TABLE_REF (Vunicode_category_table, (C)),	\
-	   (SYMBOLP (_work_val)						\
-	    && (_work_char = SDATA (SYMBOL_NAME (_work_val))[0]) != 'C'	\
-	    && _work_char != 'Z'))))
+	   (INTEGERP (_work_val)					\
+	    && (XINT (_work_val) <= UNICODE_CATEGORY_So)))))
 
 /* Update cmp_it->stop_pos to the next position after CHARPOS (and
    BYTEPOS) where character composition may happen.  If BYTEPOS is