From: Glenn Morris <rgm@gnu.org>
Date: Sat, 8 Oct 2011 21:07:23 +0000 (-0700)
Subject: Small callint.c fix.
X-Git-Tag: emacs-pretest-24.0.91~172
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8fd3bd078119d43056137316ac16f2f2ccbd6fd;p=emacs.git

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 4409d5e7f60..9cef045c029 100644
--- 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 5cf99495671..61ab4a3963e 100644
--- 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;