Mercurial > emacs

comparison src/callint.c @ 17736:8b30ef18c480

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fcall_interactively): Pass new arg to Fread_from_minibuffer and Fread_variable. (Fcall_interactively): Pass new arg to Fcompleting_read.
author Richard M. Stallman <rms@gnu.org>
date Sat, 10 May 1997 21:44:59 +0000
parents 6cfba7f41dca
children 96eb40f791e4
comparison
equal deleted inserted replaced
17735:f379e219ed8e 17736:8b30ef18c480
463 463
464 switch (*tem) 464 switch (*tem)
465 { 465 {
466 case 'a': /* Symbol defined as a function */ 466 case 'a': /* Symbol defined as a function */
467 visargs[i] = Fcompleting_read (build_string (callint_message), 467 visargs[i] = Fcompleting_read (build_string (callint_message),
468 Vobarray, Qfboundp, Qt, Qnil, Qnil); 468 Vobarray, Qfboundp, Qt,
469 Qnil, Qnil, Qnil);
469 /* Passing args[i] directly stimulates compiler bug */ 470 /* Passing args[i] directly stimulates compiler bug */
470 teml = visargs[i]; 471 teml = visargs[i];
471 args[i] = Fintern (teml, Qnil); 472 args[i] = Fintern (teml, Qnil);
472 break; 473 break;
473 474
496 visargs[i] = Fchar_to_string (teml); 497 visargs[i] = Fchar_to_string (teml);
497 break; 498 break;
498 499
499 case 'C': /* Command: symbol with interactive function */ 500 case 'C': /* Command: symbol with interactive function */
500 visargs[i] = Fcompleting_read (build_string (callint_message), 501 visargs[i] = Fcompleting_read (build_string (callint_message),
501 Vobarray, Qcommandp, Qt, Qnil, Qnil); 502 Vobarray, Qcommandp,
503 Qt, Qnil, Qnil, Qnil);
502 /* Passing args[i] directly stimulates compiler bug */ 504 /* Passing args[i] directly stimulates compiler bug */
503 teml = visargs[i]; 505 teml = visargs[i];
504 args[i] = Fintern (teml, Qnil); 506 args[i] = Fintern (teml, Qnil);
505 break; 507 break;
506 508
593 sit_for (1, 0, 0, 0); 595 sit_for (1, 0, 0, 0);
594 } 596 }
595 first = 0; 597 first = 0;
596 598
597 tem = Fread_from_minibuffer (build_string (callint_message), 599 tem = Fread_from_minibuffer (build_string (callint_message),
598 Qnil, Qnil, Qnil, Qnil); 600 Qnil, Qnil, Qnil, Qnil, Qnil);
599 if (! STRINGP (tem) || XSTRING (tem)->size == 0) 601 if (! STRINGP (tem) || XSTRING (tem)->size == 0)
600 args[i] = Qnil; 602 args[i] = Qnil;
601 else 603 else
602 args[i] = Fread (tem); 604 args[i] = Fread (tem);
603 } 605 }
643 args[i] = Fintern (teml, Qnil); 645 args[i] = Fintern (teml, Qnil);
644 break; 646 break;
645 647
646 case 'v': /* Variable name: symbol that is 648 case 'v': /* Variable name: symbol that is
647 user-variable-p. */ 649 user-variable-p. */
648 args[i] = Fread_variable (build_string (callint_message)); 650 args[i] = Fread_variable (build_string (callint_message), Qnil);
649 visargs[i] = last_minibuf_string; 651 visargs[i] = last_minibuf_string;
650 break; 652 break;
651 653
652 case 'x': /* Lisp expression read but not evaluated */ 654 case 'x': /* Lisp expression read but not evaluated */
653 args[i] = Fread_minibuffer (build_string (callint_message), Qnil); 655 args[i] = Fread_minibuffer (build_string (callint_message), Qnil);