merge from upstream

1 files changed, 3 insertions, 4 deletions

diff --git a/src/composite.c b/src/composite.c
index de9775d18f5..d402d5ad0c4 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -967,7 +967,6 @@ autocmp_chars (Lisp_Object rule, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT
 }
 
 static Lisp_Object _work_val;
-static int _work_char;
 
 /* 1 iff the character C is composable.  Characters of general
    category Z? or C? are not composable except for ZWNJ and ZWJ. */
@@ -976,9 +975,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
@@ -1027,6 +1025,7 @@ composition_compute_stop_pos (struct composition_it *cmp_it, EMACS_INT charpos,
   /* FIXME: Bidi is not yet handled well in static composition.  */
   if (charpos < endpos
       && find_composition (charpos, endpos, &start, &end, &prop, string)
+      && start >= charpos
       && COMPOSITION_VALID_P (start, end, prop))
     {
       cmp_it->stop_pos = endpos = start;