diff options
| author | Richard M. Stallman | 1997-05-10 21:44:59 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-05-10 21:44:59 +0000 |
| commit | ff9cd111c68f9d939f2bbe4af77a6b0a3376ead1 (patch) | |
| tree | b575b80fb2833973992d6486f91302fed5c2efe9 | |
| parent | 435bc8400e6cde55bb92302aff9f82d75a3da103 (diff) | |
| download | emacs-ff9cd111c68f9d939f2bbe4af77a6b0a3376ead1.tar.gz emacs-ff9cd111c68f9d939f2bbe4af77a6b0a3376ead1.zip | |
(Fcall_interactively): Pass new arg to
Fread_from_minibuffer and Fread_variable.
(Fcall_interactively): Pass new arg to Fcompleting_read.
| -rw-r--r-- | src/callint.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/callint.c b/src/callint.c index 2e803205a5d..150e70e6526 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -465,7 +465,8 @@ Otherwise, this is done only if an arg is read using the minibuffer.") | |||
| 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); |
| @@ -498,7 +499,8 @@ Otherwise, this is done only if an arg is read using the minibuffer.") | |||
| 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); |
| @@ -595,7 +597,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") | |||
| 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 |
| @@ -645,7 +647,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") | |||
| 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 | ||