Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 343-356)

   - Update from CVS
   - Update for ERC 5.1.3.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 113-115)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90

1 files changed, 2 insertions, 4 deletions

diff --git a/src/character.h b/src/character.h
index d02fdfb8b79..72823752d96 100644
--- a/src/character.h
+++ b/src/character.h
@@ -112,10 +112,8 @@ extern char unibyte_has_multibyte_table[256];
 #define CHAR_VALID_P(c, genericp) ((unsigned) (c) <= MAX_CHAR)
 
 /* Check if Lisp object X is a character or not.  */
-#define CHECK_CHARACTER(x)                                              \
-  do {                                                                  \
-    if (! CHARACTERP(x)) x = wrong_type_argument (Qcharacterp, (x));    \
-  } while (0)
+#define CHECK_CHARACTER(x) \
+  CHECK_TYPE (CHARACTERP (x), Qcharacterp, x)
 
 #define CHECK_CHARACTER_CAR(x) \
   do {                                  \