Mercurial > emacs

comparison src/callint.c @ 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 0e0275920715
children 5f08a9f278b1
comparison
equal deleted inserted replaced
23063:3301dde7abba 23064:32a7b4dc421e
496 Fother_buffer (Fcurrent_buffer (), Qnil, Qnil), 496 Fother_buffer (Fcurrent_buffer (), Qnil, Qnil),
497 Qnil); 497 Qnil);
498 break; 498 break;
499 499
500 case 'c': /* Character */ 500 case 'c': /* Character */
501 /* Use message_with_string rather than message1_nolog here, 501 args[i] = Fread_char (build_string (callint_message), Qnil);
502 so that nothing bad happens if callint_message is changed
503 within Fread_char (by a timer, for example). */
504 message_with_string ("%s", build_string (callint_message), 0);
505 args[i] = Fread_char ();
506 message1_nolog ((char *) 0); 502 message1_nolog ((char *) 0);
507 /* Passing args[i] directly stimulates compiler bug */ 503 /* Passing args[i] directly stimulates compiler bug */
508 teml = args[i]; 504 teml = args[i];
509 visargs[i] = Fchar_to_string (teml); 505 visargs[i] = Fchar_to_string (teml);
510 break; 506 break;
564 Lisp_Object tem2; 560 Lisp_Object tem2;
565 561
566 teml = Fget (teml, intern ("event-symbol-elements")); 562 teml = Fget (teml, intern ("event-symbol-elements"));
567 tem2 = Fmemq (intern ("down"), teml); 563 tem2 = Fmemq (intern ("down"), teml);
568 if (! NILP (tem2)) 564 if (! NILP (tem2))
569 Fread_event (); 565 Fread_event (Qnil, Qnil);
570 } 566 }
571 } 567 }
572 break; 568 break;
573 569
574 case 'K': /* Key sequence to be defined. */ 570 case 'K': /* Key sequence to be defined. */
591 Lisp_Object tem2; 587 Lisp_Object tem2;
592 588
593 teml = Fget (teml, intern ("event-symbol-elements")); 589 teml = Fget (teml, intern ("event-symbol-elements"));
594 tem2 = Fmemq (intern ("down"), teml); 590 tem2 = Fmemq (intern ("down"), teml);
595 if (! NILP (tem2)) 591 if (! NILP (tem2))
596 Fread_event (); 592 Fread_event (Qnil, Qnil);
597 } 593 }
598 } 594 }
599 break; 595 break;
600 596
601 case 'e': /* The invoking event. */ 597 case 'e': /* The invoking event. */