(CHECK_CHARSET, CHECK_CHARSET_GET_ID, CHECK_CHARSET_GET_ATTR):

Don't use the inexistent return value of wrong_type_argument.

diff --git a/src/ChangeLog b/src/ChangeLog
index bce1376877557e24ae204cd8742a8ef5bf5b2845..eec2143b392558cd3d928a5322b8b3a60db4f344 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
+       (CHECK_CHARSET_GET_ATTR): Don't use the inexistent return value of
+       wrong_type_argument.
+
 2008-02-22  Kenichi Handa  <handa@ni.aist.go.jp>
 
        * Makefile.in (lisp): Remove devanagari.el, kannada.el,

diff --git a/src/charset.h b/src/charset.h
index 3d31d903100a8d54940faab3aa7a0653d0927368..4b8bee4520d93f5cbef59c93d0225e69b0961c16 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -339,7 +339,7 @@ extern struct charset *emacs_mule_charset[256];
 #define CHECK_CHARSET(x)                                       \
   do {                                                         \
     if (! SYMBOLP (x) || CHARSET_SYMBOL_HASH_INDEX (x) < 0)    \
-      x = wrong_type_argument (Qcharsetp, (x));                        \
+      wrong_type_argument (Qcharsetp, (x));                    \
   } while (0)
 
 
@@ -350,7 +350,7 @@ extern struct charset *emacs_mule_charset[256];
     int idx;                                                           \
                                                                        \
     if (! SYMBOLP (x) || (idx = CHARSET_SYMBOL_HASH_INDEX (x)) < 0)    \
-      x = wrong_type_argument (Qcharsetp, (x));                                \
+      wrong_type_argument (Qcharsetp, (x));                            \
     id = XINT (AREF (HASH_VALUE (XHASH_TABLE (Vcharset_hash_table), idx), \
                     charset_id));                                      \
   } while (0)
@@ -361,7 +361,7 @@ extern struct charset *emacs_mule_charset[256];
 #define CHECK_CHARSET_GET_ATTR(x, attr)                                \
   do {                                                                 \
     if (!SYMBOLP (x) || NILP (attr = CHARSET_SYMBOL_ATTRIBUTES (x)))   \
-      x = wrong_type_argument (Qcharsetp, (x));                                \
+      wrong_type_argument (Qcharsetp, (x));                            \
   } while (0)