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

3 files changed, 12 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e325d82f04a..147ee163db8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.c (Fminibuffer_contents, Fminibuffer_contents_no_properties)
+        (Fminibuffer_completion_contents, Fdelete_minibuffer_contents):
+        Doc fixes.
+
 2007-04-16  Chong Yidong  <cyd@stupidchicken.com>
 
         * dispnew.c (adjust_frame_glyphs_for_frame_redisplay): Set
diff --git a/src/mac.c b/src/mac.c
index 8363326cc05..8e3f49d2bfe 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -4991,7 +4991,7 @@ extern int noninteractive;
    3. [If SELECT_USE_CFSOCKET is set]
       Only the window event channel and socket read/write channels are
       involved, and timeout is not too short (greater than
-      SELECT_TIMEOUT_THRESHHOLD_RUNLOOP seconds).
+      SELECT_TIMEOUT_THRESHOLD_RUNLOOP seconds).
       -> Create CFSocket for each socket and add it into the current
          event RunLoop so that the current event loop gets quit when
          the socket becomes ready.  Then ReceiveNextEvent can wait for
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)