(mac_draw_string_common): Remove arg MODE. New arg

[bpt/emacs.git] / src / coding.c

diff --git a/src/coding.c b/src/coding.c
index 5985e89..b96ec82 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -1,5 +1,6 @@
 /* Coding system handler (conversion, detection, and etc).
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 2005
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
@@ -872,7 +873,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.  */
@@ -924,6 +925,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))
     {