Small callint.c fix.

* src/callint.c (Fcall_interactively): Give a more explicit error for the
'c' case with a non-character input.

Fixes: debbugs:8479

diff --git a/src/ChangeLog b/src/ChangeLog
index 4409d5e7f608e8ec6334883d65bf0ffef04cea84..9cef045c0293deee53c1f405cc20ee47ecabb69e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-08  Glenn Morris  <rgm@gnu.org>
+
+       * callint.c (Fcall_interactively): Give a more explicit error for the
+       'c' case with a non-character input.  (Bug#8479)
+
 2011-10-08  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (hscroll_window_tree): Support hscroll in right-to-left

diff --git a/src/callint.c b/src/callint.c
index 5cf99495671793481dd14cbf2b49ad8fd95a471d..61ab4a3963e4fe69ffbb6ebcf7da4f1cb26f0f1c 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -535,6 +535,8 @@ invoke it.  If KEYS is omitted or nil, the return value of
          message1_nolog ((char *) 0);
          /* Passing args[i] directly stimulates compiler bug */
          teml = args[i];
+         /* See bug#8479.  */
+         if (! CHARACTERP (teml)) error ("Non-character input-event");
          visargs[i] = Fchar_to_string (teml);
          break;