Mercurial > emacs
changeset 92107:5a1ea5a32206
(CHECK_CHARSET, CHECK_CHARSET_GET_ID, CHECK_CHARSET_GET_ATTR):
Don't use the inexistent return value of wrong_type_argument.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 22 Feb 2008 17:24:05 +0000 |
| parents | cc105bac19d0 |
| children | fc5344b71cdb |
| files | src/ChangeLog src/charset.h |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Feb 22 15:10:13 2008 +0000 +++ b/src/ChangeLog Fri Feb 22 17:24:05 2008 +0000 @@ -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,
--- a/src/charset.h Fri Feb 22 15:10:13 2008 +0000 +++ b/src/charset.h Fri Feb 22 17:24:05 2008 +0000 @@ -339,7 +339,7 @@ #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 @@ 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 @@ #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)