From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 17 Dec 2001 14:05:07 +0000 (+0000)
Subject: (DECODE_COMPOSITION_END): Check for ! COMPOSING (coding)
X-Git-Tag: ttn-vms-21-2-B4~17665
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8446041d5248f2cba5b0252421213230ec37903;p=emacs.git

(DECODE_COMPOSITION_END): Check for ! COMPOSING (coding)
instead of only for COMPOSITION_DISABLED.
---

diff --git a/src/coding.c b/src/coding.c
index f2dde6695da..9c45a65ff88 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1665,7 +1665,7 @@ coding_allocate_composition_data (coding, char_offset)
 
 #define DECODE_COMPOSITION_END(c1)					\
   do {									\
-    if (coding->composing == COMPOSITION_DISABLED)			\
+    if (! COMPOSING (coding))						\
       {									\
 	*dst++ = ISO_CODE_ESC;						\
 	*dst++ = c1;							\