diff options
| author | Miles Bader | 2006-06-07 18:05:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-06-07 18:05:10 +0000 |
| commit | b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb (patch) | |
| tree | de3804210a8cd955e0d3b9abc15679480930bc82 /src/callint.c | |
| parent | 885b7d0991bd4b4b8f4bd1d3cd21c18a697bbce2 (diff) | |
| parent | 26c9afc3239e18b03537faaea33e3e82e28099e6 (diff) | |
| download | emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.tar.gz emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
Diffstat (limited to 'src/callint.c')
| -rw-r--r-- | src/callint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/callint.c b/src/callint.c index 4789fb5582d..ae10e64e1de 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -730,7 +730,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used. */) | |||
| 730 | 730 | ||
| 731 | tem = Fread_from_minibuffer (build_string (callint_message), | 731 | tem = Fread_from_minibuffer (build_string (callint_message), |
| 732 | Qnil, Qnil, Qnil, Qnil, Qnil, | 732 | Qnil, Qnil, Qnil, Qnil, Qnil, |
| 733 | Qnil, Qnil); | 733 | Qnil); |
| 734 | if (! STRINGP (tem) || SCHARS (tem) == 0) | 734 | if (! STRINGP (tem) || SCHARS (tem) == 0) |
| 735 | args[i] = Qnil; | 735 | args[i] = Qnil; |
| 736 | else | 736 | else |