Mercurial > emacs
changeset 5376:eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 30 Dec 1993 16:43:05 +0000 |
| parents | 0e30cf7aa525 |
| children | 7a8463c07d8f |
| files | src/minibuf.c |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/minibuf.c Thu Dec 30 11:56:19 1993 +0000 +++ b/src/minibuf.c Thu Dec 30 16:43:05 1993 +0000 @@ -392,27 +392,27 @@ DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 5, 0, 0 /* See immediately above */) - (prompt, initial_input, keymap, read, hist) - Lisp_Object prompt, initial_input, keymap, read, hist; + (prompt, initial_contents, keymap, read, hist) + Lisp_Object prompt, initial_contents, keymap, read, hist; { int pos = 0; Lisp_Object histvar, histpos, position; position = Qnil; CHECK_STRING (prompt, 0); - if (!NILP (initial_input)) + if (!NILP (initial_contents)) { - if (XTYPE (initial_input) == Lisp_Cons) + if (XTYPE (initial_contents) == Lisp_Cons) { - position = Fcdr (initial_input); - initial_input = Fcar (initial_input); + position = Fcdr (initial_contents); + initial_contents = Fcar (initial_contents); } - CHECK_STRING (initial_input, 1); + CHECK_STRING (initial_contents, 1); if (!NILP (position)) { CHECK_NUMBER (position, 0); /* Convert to distance from end of input. */ - pos = XINT (position) - 1 - XSTRING (initial_input)->size; + pos = XINT (position) - 1 - XSTRING (initial_contents)->size; } } @@ -436,7 +436,7 @@ if (NILP (histpos)) XFASTINT (histpos) = 0; - return read_minibuf (keymap, initial_input, prompt, + return read_minibuf (keymap, initial_contents, prompt, make_number (pos), !NILP (read), histvar, histpos); }