Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 688, 691, 695)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 213-214)

   - Update from CVS
   - Merge from emacs--devo--0

2007-04-06  Chong Yidong  <cyd@stupidchicken.com>

   * contrib/sendmail.el (mail-text, mail-mode): Revert extant pieces of
   1995-05-19 doc changes.

2007-04-07  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/tls.el (open-tls-stream): Properly handle case where there
   is no associated buffer.

2007-04-03  Thien-Thi Nguyen  <ttn@gnu.org>

   * lisp/gnus-msg.el (gnus-inews-yank-articles): Fix bug: After
   message-yank-original, make sure (< mark TEXT point).

2007-03-31  Eli Zaretskii  <eliz@gnu.org>

   * texi/emacs-mime.texi (Non-MIME): Postscript -> PostScript.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-314

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 92b5e55..3e248e1 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-06  Chong Yidong  <cyd@stupidchicken.com>
+
+       * sendmail.el (mail-text, mail-mode): Revert extant pieces of
+       1995-05-19 doc changes.
+
 2007-03-26  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
        * nnir.el (gnus-group-make-nnir-group): Put a message-unique-id into

diff --git a/contrib/sendmail.el b/contrib/sendmail.el
index 2bb1a6e..c0fcdf8 100644 (file)
--- a/contrib/sendmail.el
+++ b/contrib/sendmail.el
@@ -620,16 +620,16 @@ Like Text Mode but with these additional commands:
 \\[mail-send-and-exit]  mail-send-and-exit (send the message and exit)
 
 Here are commands that move to a header field (and create it if there isn't):
-        \\[mail-to]  move to To:       \\[mail-subject]  move to Subject:
-        \\[mail-cc]  move to CC:       \\[mail-bcc]  move to BCC:
+        \\[mail-to]  move to To:       \\[mail-subject]  move to Subj:
+        \\[mail-bcc]  move to BCC:     \\[mail-cc]  move to CC:
         \\[mail-fcc]  move to FCC:     \\[mail-reply-to] move to Reply-To:
          \\[mail-mail-reply-to]  move to Mail-Reply-To:
          \\[mail-mail-followup-to] move to Mail-Followup-To:
-\\[mail-text]  mail-text (move to beginning of message text).
+\\[mail-text]  move to message text.
 \\[mail-signature]  mail-signature (insert `mail-signature-file' file).
 \\[mail-yank-original]  mail-yank-original (insert current message, in Rmail).
 \\[mail-fill-yanked-message]  mail-fill-yanked-message (fill what was yanked).
-\\[mail-sent-via]  mail-sent-via (add a Sent-via field for each To or CC).
+\\[mail-sent-via]  mail-sent-via (add a sent-via field for each To or CC).
 Turning on Mail mode runs the normal hooks `text-mode-hook' and
 `mail-mode-hook' (in that order)."
   (make-local-variable 'mail-reply-action)
@@ -1392,7 +1392,7 @@ Create a Mail-Followup-To field if none."
       nil)))
 
 (defun mail-text ()
-  "Move point to beginning of message text."
+  "Move point to beginning of text field."
   (interactive)
   (expand-abbrev)
   (goto-char (mail-text-start)))

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5aaf475..4db82e6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-07  Chong Yidong  <cyd@stupidchicken.com>
+
+       * tls.el (open-tls-stream): Properly handle case where there
+       is no associated buffer.
+
+2007-04-03  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * gnus-msg.el (gnus-inews-yank-articles): Fix bug: After
+       message-yank-original, make sure (< mark TEXT point).
+
 2007-03-31  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * message.el (message-fill-column): New variable.

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index dd4aa30..419734e 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -789,6 +789,7 @@ active, the entire article will be yanked."
                 (nnheader-narrow-to-headers)
                 (nnheader-parse-naked-head)))))
        (message-yank-original)
+       (exchange-point-and-mark)       ; so that (< mark TEXT point)
        (setq beg (or beg (mark t))))
       (when articles
        (insert "\n")))

diff --git a/lisp/tls.el b/lisp/tls.el
index 9de74ca..cdbb7be 100644 (file)
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -125,12 +125,17 @@ BUFFER is the buffer (or buffer-name) to associate with the process.
  with any buffer
 Third arg is name of the host to connect to, or its IP address.
 Fourth arg PORT is an integer specifying a port to connect to."
-  (let ((cmds tls-program) cmd done)
+  (let ((cmds tls-program)
+       (use-temp-buffer (null buffer))
+       process cmd done)
+    (if use-temp-buffer
+       (setq buffer (generate-new-buffer " TLS")))
     (message "Opening TLS connection to `%s'..." host)
     (while (and (not done) (setq cmd (pop cmds)))
       (message "Opening TLS connection with `%s'..." cmd)
-      (let* ((process-connection-type tls-process-connection-type)
-            (process (start-process
+      (let ((process-connection-type tls-process-connection-type)
+           response)
+       (setq process (start-process
                       name buffer shell-file-name shell-command-switch
                       (format-spec
                        cmd
@@ -139,7 +144,6 @@ Fourth arg PORT is an integer specifying a port to connect to."
                         ?p (if (integerp port)
                                (int-to-string port)
                              port)))))
-            response)
        (while (and process
                    (memq (process-status process) '(open run))
                    (save-excursion
@@ -155,6 +159,9 @@ Fourth arg PORT is an integer specifying a port to connect to."
          (delete-process process))))
     (message "Opening TLS connection to `%s'...%s"
             host (if done "done" "failed"))
+    (when use-temp-buffer
+      (if done (set-process-buffer process nil))
+      (kill-buffer buffer))
     done))
 
 (provide 'tls)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 8205d2b..3344392 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -8,6 +8,10 @@
 
        * gnus-news.el (gnus-news-header-disclaimer): Add newlines.
 
+2007-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+       * emacs-mime.texi (Non-MIME): Postscript -> PostScript.
+
 2007-03-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi: Untabify.

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 5d319cd..a3571d3 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -125,7 +125,7 @@ diff.  Each of these features can be disabled by add an item into
 @table @code
 @item postscript
 @findex postscript
-Postscript file.
+PostScript file.
 
 @item uu
 @findex uu