diff options
| author | Richard M. Stallman | 1993-12-30 16:43:05 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-12-30 16:43:05 +0000 |
| commit | 68e5a8a28dfbef46cb43a2b89149aa996ac91d47 (patch) | |
| tree | faafb57a617f2c326c2e3bd2daeeaf3082dd90b0 /src | |
| parent | c89164c5e56130ea498d9132e22de9f02debc157 (diff) | |
| download | emacs-68e5a8a28dfbef46cb43a2b89149aa996ac91d47.tar.gz emacs-68e5a8a28dfbef46cb43a2b89149aa996ac91d47.zip | |
(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\ | |||
| 392 | 392 | ||
| 393 | DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 5, 0, | 393 | DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 5, 0, |
| 394 | 0 /* See immediately above */) | 394 | 0 /* See immediately above */) |
| 395 | (prompt, initial_input, keymap, read, hist) | 395 | (prompt, initial_contents, keymap, read, hist) |
| 396 | Lisp_Object prompt, initial_input, keymap, read, hist; | 396 | Lisp_Object prompt, initial_contents, keymap, read, hist; |
| 397 | { | 397 | { |
| 398 | int pos = 0; | 398 | int pos = 0; |
| 399 | Lisp_Object histvar, histpos, position; | 399 | Lisp_Object histvar, histpos, position; |
| 400 | position = Qnil; | 400 | position = Qnil; |
| 401 | 401 | ||
| 402 | CHECK_STRING (prompt, 0); | 402 | CHECK_STRING (prompt, 0); |
| 403 | if (!NILP (initial_input)) | 403 | if (!NILP (initial_contents)) |
| 404 | { | 404 | { |
| 405 | if (XTYPE (initial_input) == Lisp_Cons) | 405 | if (XTYPE (initial_contents) == Lisp_Cons) |
| 406 | { | 406 | { |
| 407 | position = Fcdr (initial_input); | 407 | position = Fcdr (initial_contents); |
| 408 | initial_input = Fcar (initial_input); | 408 | initial_contents = Fcar (initial_contents); |
| 409 | } | 409 | } |
| 410 | CHECK_STRING (initial_input, 1); | 410 | CHECK_STRING (initial_contents, 1); |
| 411 | if (!NILP (position)) | 411 | if (!NILP (position)) |
| 412 | { | 412 | { |
| 413 | CHECK_NUMBER (position, 0); | 413 | CHECK_NUMBER (position, 0); |
| 414 | /* Convert to distance from end of input. */ | 414 | /* Convert to distance from end of input. */ |
| 415 | pos = XINT (position) - 1 - XSTRING (initial_input)->size; | 415 | pos = XINT (position) - 1 - XSTRING (initial_contents)->size; |
| 416 | } | 416 | } |
| 417 | } | 417 | } |
| 418 | 418 | ||
| @@ -436,7 +436,7 @@ DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, | |||
| 436 | if (NILP (histpos)) | 436 | if (NILP (histpos)) |
| 437 | XFASTINT (histpos) = 0; | 437 | XFASTINT (histpos) = 0; |
| 438 | 438 | ||
| 439 | return read_minibuf (keymap, initial_input, prompt, | 439 | return read_minibuf (keymap, initial_contents, prompt, |
| 440 | make_number (pos), !NILP (read), histvar, histpos); | 440 | make_number (pos), !NILP (read), histvar, histpos); |
| 441 | } | 441 | } |
| 442 | 442 | ||