aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2007-04-19 22:22:16 +0000
committerJuanma Barranquero2007-04-19 22:22:16 +0000
commit6cc62df0e83cadfd0635ad4128ea2890f959d639 (patch)
tree5b39a06f14c9b39881c2ddca429f8cfb7a64c058 /src
parenta49f23e9d8cedd7c68d193f3bcd4dcad8d066f8a (diff)
downloademacs-6cc62df0e83cadfd0635ad4128ea2890f959d639.tar.gz
emacs-6cc62df0e83cadfd0635ad4128ea2890f959d639.zip
(Fminibuffer_contents, Fminibuffer_contents_no_properties,
Fminibuffer_completion_contents, Fdelete_minibuffer_contents): Doc fixes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/minibuf.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e325d82f04a..147ee163db8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12007-04-19 Juanma Barranquero <lekktu@gmail.com>
2
3 * minibuf.c (Fminibuffer_contents, Fminibuffer_contents_no_properties)
4 (Fminibuffer_completion_contents, Fdelete_minibuffer_contents):
5 Doc fixes.
6
12007-04-16 Chong Yidong <cyd@stupidchicken.com> 72007-04-16 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * dispnew.c (adjust_frame_glyphs_for_frame_redisplay): Set 9 * dispnew.c (adjust_frame_glyphs_for_frame_redisplay): Set
diff --git a/src/minibuf.c b/src/minibuf.c
index 1c2cfc45306..db069aaf29e 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -386,7 +386,7 @@ Return (point-min) if current buffer is not a minibuffer. */)
386DEFUN ("minibuffer-contents", Fminibuffer_contents, 386DEFUN ("minibuffer-contents", Fminibuffer_contents,
387 Sminibuffer_contents, 0, 0, 0, 387 Sminibuffer_contents, 0, 0, 0,
388 doc: /* Return the user input in a minibuffer as a string. 388 doc: /* Return the user input in a minibuffer as a string.
389The current buffer must be a minibuffer. */) 389If the current buffer is not a minibuffer, return its entire contents. */)
390 () 390 ()
391{ 391{
392 int prompt_end = XINT (Fminibuffer_prompt_end ()); 392 int prompt_end = XINT (Fminibuffer_prompt_end ());
@@ -396,7 +396,7 @@ The current buffer must be a minibuffer. */)
396DEFUN ("minibuffer-contents-no-properties", Fminibuffer_contents_no_properties, 396DEFUN ("minibuffer-contents-no-properties", Fminibuffer_contents_no_properties,
397 Sminibuffer_contents_no_properties, 0, 0, 0, 397 Sminibuffer_contents_no_properties, 0, 0, 0,
398 doc: /* Return the user input in a minibuffer as a string, without text-properties. 398 doc: /* Return the user input in a minibuffer as a string, without text-properties.
399The current buffer must be a minibuffer. */) 399If the current buffer is not a minibuffer, return its entire contents. */)
400 () 400 ()
401{ 401{
402 int prompt_end = XINT (Fminibuffer_prompt_end ()); 402 int prompt_end = XINT (Fminibuffer_prompt_end ());
@@ -407,7 +407,7 @@ DEFUN ("minibuffer-completion-contents", Fminibuffer_completion_contents,
407 Sminibuffer_completion_contents, 0, 0, 0, 407 Sminibuffer_completion_contents, 0, 0, 0,
408 doc: /* Return the user input in a minibuffer before point as a string. 408 doc: /* Return the user input in a minibuffer before point as a string.
409That is what completion commands operate on. 409That is what completion commands operate on.
410The current buffer must be a minibuffer. */) 410If the current buffer is not a minibuffer, return its entire contents. */)
411 () 411 ()
412{ 412{
413 int prompt_end = XINT (Fminibuffer_prompt_end ()); 413 int prompt_end = XINT (Fminibuffer_prompt_end ());
@@ -419,7 +419,7 @@ The current buffer must be a minibuffer. */)
419DEFUN ("delete-minibuffer-contents", Fdelete_minibuffer_contents, 419DEFUN ("delete-minibuffer-contents", Fdelete_minibuffer_contents,
420 Sdelete_minibuffer_contents, 0, 0, 0, 420 Sdelete_minibuffer_contents, 0, 0, 0,
421 doc: /* Delete all user input in a minibuffer. 421 doc: /* Delete all user input in a minibuffer.
422The current buffer must be a minibuffer. */) 422If the current buffer is not a minibuffer, erase its entire contents. */)
423 () 423 ()
424{ 424{
425 int prompt_end = XINT (Fminibuffer_prompt_end ()); 425 int prompt_end = XINT (Fminibuffer_prompt_end ());
@@ -704,7 +704,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
704 if (!NILP (current_buffer->enable_multibyte_characters) 704 if (!NILP (current_buffer->enable_multibyte_characters)
705 && ! STRING_MULTIBYTE (minibuf_prompt)) 705 && ! STRING_MULTIBYTE (minibuf_prompt))
706 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt); 706 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);
707 707
708 /* Insert the prompt, record where it ends. */ 708 /* Insert the prompt, record where it ends. */
709 Finsert (1, &minibuf_prompt); 709 Finsert (1, &minibuf_prompt);
710 if (PT > BEG) 710 if (PT > BEG)