*** empty log message ***

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

diff --git a/src/charset.c b/src/charset.c
index 15a5d75..d5b1509 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1,8 +1,11 @@
 /* Basic character set support.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
+
    Copyright (C) 2003, 2004
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
@@ -591,17 +594,6 @@ map_charset_chars (c_function, function, arg,
     {
       if (! CHAR_TABLE_P (CHARSET_ENCODER (charset)))
        return;
-      if (CHARSET_ASCII_COMPATIBLE_P (charset) && from <= 127)
-       {
-         range = Fcons (make_number (from), make_number (to));
-         if (to >= 128)
-           XSETCAR (range, make_number (127));
-
-         if (NILP (function))
-           (*c_function) (arg, range);
-         else
-           call2 (function, range, arg);
-       }
       map_char_table_for_charset (c_function, function,
                                  CHARSET_ENCODER (charset), arg,
                                  partial ? charset : NULL, from, to);
@@ -1052,6 +1044,8 @@ usage: (define-charset-internal ...)  */)
       emacs_mule_charset[charset.emacs_mule_id] = CHARSET_FROM_ID (id);
       if (charset.emacs_mule_id < 0xA0)
        emacs_mule_bytes[charset.emacs_mule_id] = charset.dimension + 1;
+      else
+       emacs_mule_bytes[charset.emacs_mule_id] = charset.dimension + 2;
       if (new_definition_p)
        Vemacs_mule_charset_list = nconc2 (Vemacs_mule_charset_list,
                                           Fcons (make_number (id), Qnil));