Mercurial > emacs

changeset 47698:77511decc5ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(decode_coding_emacs_mule): Check coding->cmp_data. Only when it is non-nil, handle composition sequence. (setup_coding_system) <0>: Don't force composition handling.
author Kenichi Handa <handa@m17n.org>
date Mon, 30 Sep 2002 06:28:31 +0000
parents 34ce7f0515d0
children a8e563d6dbb3
files src/coding.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/coding.c	Mon Sep 30 04:25:38 2002 +0000
+++ b/src/coding.c	Mon Sep 30 06:28:31 2002 +0000
@@ -968,7 +968,7 @@
 	  coding->produced_char++;
 	  continue;
 	}
-      else if (*src == 0x80)
+      else if (*src == 0x80 && coding->cmp_data)
 	{
 	  /* Start of composition data.  */
 	  int consumed  = decode_composition_emacs_mule (coding, src, src_end,
@@ -3506,7 +3506,6 @@
       coding->type = coding_type_emacs_mule;
       coding->common_flags
 	|= CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK;
-      coding->composing = COMPOSITION_NO;
       if (!NILP (coding->post_read_conversion))
 	coding->common_flags |= CODING_REQUIRE_DECODING_MASK;
       if (!NILP (coding->pre_write_conversion))