2 files changed, 8 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f9c629c1c56..24f32f141e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-21  Chong Yidong  <cyd@gnu.org>
+
+        * editfns.c (Finsert_char): Since read-char-by-name now signals an
+        error for invalid chars, don't check for a nil return value.
+
 2012-12-20  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Avoid calls to CHAR_TO_BYTE if byte position is known.
diff --git a/src/editfns.c b/src/editfns.c
index d7fe1c1c4c4..bb5cc437d9b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2361,10 +2361,9 @@ usage: (insert-before-markers-and-inherit &rest ARGS)  */)
 }
 
 DEFUN ("insert-char", Finsert_char, Sinsert_char, 1, 3,
-       "(list (or (read-char-by-name \"Insert character (Unicode name or hex): \")\
-          (error \"You did not specify a valid character\"))\
-      (prefix-numeric-value current-prefix-arg)\
-      t))",
+       "(list (read-char-by-name \"Insert character (Unicode name or hex): \")\
+              (prefix-numeric-value current-prefix-arg)\
+              t))",
        doc: /* Insert COUNT copies of CHARACTER.
 Interactively, prompt for CHARACTER.  You can specify CHARACTER in one
 of these ways: