diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-12-30 16:43:05 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-12-30 16:43:05 +0000 |
| commit | 68e5a8a28dfbef46cb43a2b89149aa996ac91d47 (patch) | |
| tree | faafb57a617f2c326c2e3bd2daeeaf3082dd90b0 /src | |
| parent | c89164c5e56130ea498d9132e22de9f02debc157 (diff) | |
| download | emacs-68e5a8a28dfbef46cb43a2b89149aa996ac91d47.tar.gz | |
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Diffstat (limited to 'src')
| -rw-r--r-- | src/minibuf.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 82d48a47015..c160711f903 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -392,27 +392,27 @@ Fifth arg HIST, if non-nil, specifies a history list\n\ 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 @@ DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 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); } |
