diff options
| author | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:45:07 +0000 |
|---|---|---|
| committer | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:45:07 +0000 |
| commit | 0db29115a48bbf4231b374b7579cea7bc684a097 (patch) | |
| tree | 1a77e049fc4b3342fb4c31f7305c028a18d76de9 /src/minibuf.c | |
| parent | e55fb0cd75d55c1e7d40b24607f144d8ccf6626f (diff) | |
| parent | 1b025b6588f49876b6b67c5f555d2c9cb54ca18d (diff) | |
| download | emacs-0db29115a48bbf4231b374b7579cea7bc684a097.tar.gz | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-702
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-703
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-704
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-705
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-706
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-707
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-216
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-602
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index e3fb8641615..34caf2b430f 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -387,7 +387,7 @@ Return (point-min) if current buffer is not a minibuffer. */) DEFUN ("minibuffer-contents", Fminibuffer_contents, Sminibuffer_contents, 0, 0, 0, doc: /* Return the user input in a minibuffer as a string. -The current buffer must be a minibuffer. */) +If the current buffer is not a minibuffer, return its entire contents. */) () { int prompt_end = XINT (Fminibuffer_prompt_end ()); @@ -397,7 +397,7 @@ The current buffer must be a minibuffer. */) DEFUN ("minibuffer-contents-no-properties", Fminibuffer_contents_no_properties, Sminibuffer_contents_no_properties, 0, 0, 0, doc: /* Return the user input in a minibuffer as a string, without text-properties. -The current buffer must be a minibuffer. */) +If the current buffer is not a minibuffer, return its entire contents. */) () { int prompt_end = XINT (Fminibuffer_prompt_end ()); @@ -408,7 +408,7 @@ DEFUN ("minibuffer-completion-contents", Fminibuffer_completion_contents, Sminibuffer_completion_contents, 0, 0, 0, doc: /* Return the user input in a minibuffer before point as a string. That is what completion commands operate on. -The current buffer must be a minibuffer. */) +If the current buffer is not a minibuffer, return its entire contents. */) () { int prompt_end = XINT (Fminibuffer_prompt_end ()); @@ -420,7 +420,7 @@ The current buffer must be a minibuffer. */) DEFUN ("delete-minibuffer-contents", Fdelete_minibuffer_contents, Sdelete_minibuffer_contents, 0, 0, 0, doc: /* Delete all user input in a minibuffer. -The current buffer must be a minibuffer. */) +If the current buffer is not a minibuffer, erase its entire contents. */) () { int prompt_end = XINT (Fminibuffer_prompt_end ()); @@ -706,7 +706,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag, if (!NILP (current_buffer->enable_multibyte_characters) && ! STRING_MULTIBYTE (minibuf_prompt)) minibuf_prompt = Fstring_make_multibyte (minibuf_prompt); - + /* Insert the prompt, record where it ends. */ Finsert (1, &minibuf_prompt); if (PT > BEG) |