diff options
| author | Luc Teirlinck | 2004-11-21 01:02:51 +0000 |
|---|---|---|
| committer | Luc Teirlinck | 2004-11-21 01:02:51 +0000 |
| commit | 2dafe1c923d84d132e314e68d3c8b42c06c23881 (patch) | |
| tree | dcf16e1ef5202206df508113b19786510372e883 /src | |
| parent | 8181f402eda0338aac54f09750690bb8e011e6fa (diff) | |
| download | emacs-2dafe1c923d84d132e314e68d3c8b42c06c23881.tar.gz emacs-2dafe1c923d84d132e314e68d3c8b42c06c23881.zip | |
(Fcall_interactively): Call Fread_from_minibuffer with extra argument.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/callint.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 299217c925d..b7f0dc6f74c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2004-11-20 Luc Teirlinck <teirllm@auburn.edu> | ||
| 2 | |||
| 3 | * fns.c (Fyes_or_no_p): Call Fread_from_minibuffer with extra | ||
| 4 | argument. | ||
| 5 | * callint.c (Fcall_interactively): Ditto. | ||
| 6 | |||
| 1 | 2004-11-20 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2004-11-20 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * minibuf.c (Fminibuffer_complete_and_exit): | 9 | * minibuf.c (Fminibuffer_complete_and_exit): |
diff --git a/src/callint.c b/src/callint.c index bb71ad50f44..933601f67d0 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -723,7 +723,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used. */) | |||
| 723 | 723 | ||
| 724 | tem = Fread_from_minibuffer (build_string (callint_message), | 724 | tem = Fread_from_minibuffer (build_string (callint_message), |
| 725 | Qnil, Qnil, Qnil, Qnil, Qnil, | 725 | Qnil, Qnil, Qnil, Qnil, Qnil, |
| 726 | Qnil); | 726 | Qnil, Qnil); |
| 727 | if (! STRINGP (tem) || SCHARS (tem) == 0) | 727 | if (! STRINGP (tem) || SCHARS (tem) == 0) |
| 728 | args[i] = Qnil; | 728 | args[i] = Qnil; |
| 729 | else | 729 | else |