Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-32
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-33
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-34
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-35
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-36
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-37
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-8
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-9
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-10
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-11
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-12
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-13
   Merge from emacs--devo--0

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-504

1 files changed, 3 insertions, 1 deletions

diff --git a/src/coding.c b/src/coding.c
index 14f8fd33285..2358f3e13f3 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -868,7 +868,7 @@ decode_composition_emacs_mule (coding, src, src_end,
           component[ncomponent] = c;
         }
     }
-  else
+  else if (c >= 0x80)
     {
       /* This may be an old Emacs 20 style format.  See the comment at
          the section 2 of this file.  */
@@ -920,6 +920,8 @@ decode_composition_emacs_mule (coding, src, src_end,
       else
         return 0;
     }
+  else
+    return 0;
 
   if (buf == bufp || dst + (bufp - buf) <= (dst_bytes ? dst_end : src))
     {