Mercurial > emacs

changeset 23064:32a7b4dc421e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fcall_interactively): Pass new args to Fread_event and Fread_char. Let Fread_char do the prompting.
author Richard M. Stallman <rms@gnu.org>
date Tue, 18 Aug 1998 11:06:30 +0000
parents 3301dde7abba
children 26b311ef19c6
files src/callint.c
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/callint.c	Tue Aug 18 11:05:37 1998 +0000
+++ b/src/callint.c	Tue Aug 18 11:06:30 1998 +0000
@@ -498,11 +498,7 @@
 	  break;
 
         case 'c':		/* Character */
-	  /* Use message_with_string rather than message1_nolog here,
-	     so that nothing bad happens if callint_message is changed
-	     within Fread_char (by a timer, for example).  */
-	  message_with_string ("%s", build_string (callint_message), 0);
-	  args[i] = Fread_char ();
+	  args[i] = Fread_char (build_string (callint_message), Qnil);
 	  message1_nolog ((char *) 0);
 	  /* Passing args[i] directly stimulates compiler bug */
 	  teml = args[i];
@@ -566,7 +562,7 @@
 		teml = Fget (teml, intern ("event-symbol-elements"));
 		tem2 = Fmemq (intern ("down"), teml);
 		if (! NILP (tem2))
-		  Fread_event ();
+		  Fread_event (Qnil, Qnil);
 	      }
 	  }
 	  break;
@@ -593,7 +589,7 @@
 		teml = Fget (teml, intern ("event-symbol-elements"));
 		tem2 = Fmemq (intern ("down"), teml);
 		if (! NILP (tem2))
-		  Fread_event ();
+		  Fread_event (Qnil, Qnil);
 	      }
 	  }
 	  break;