diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-22 17:24:05 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-22 17:24:05 +0000 |
| commit | 43d1af233119925f06b9dd8da6ce5380f4b213ee (patch) | |
| tree | 50afae81ef724f2910b04aaa727cbc09fcd6b855 | |
| parent | d007adda8978b5ba63ed631c1f83b91adb452024 (diff) | |
| download | emacs-43d1af233119925f06b9dd8da6ce5380f4b213ee.tar.gz | |
(CHECK_CHARSET, CHECK_CHARSET_GET_ID, CHECK_CHARSET_GET_ATTR):
Don't use the inexistent return value of wrong_type_argument.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/charset.h | 6 |
2 files changed, 9 insertions, 3 deletions
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) |