From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 22 Feb 2008 17:24:05 +0000 (+0000)
Subject: (CHECK_CHARSET, CHECK_CHARSET_GET_ID, CHECK_CHARSET_GET_ATTR):
X-Git-Tag: emacs-pretest-23.0.90~7743
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43d1af233119925f06b9dd8da6ce5380f4b213ee;p=emacs.git

(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 bce13768775..eec2143b392 100644
--- 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 3d31d903100..4b8bee4520d 100644
--- 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)