Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 674, 677, 679, 685)

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

 * gnus--rel--5.10  (patch 212)

   - Merge from emacs--devo--0

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

   * lisp/message.el (message-yank-original): Fix bug:
   Don't switch point and mark unnecessarily.

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

   * lisp/tls.el (open-tls-stream): In handshake-waiting loop,
   don't wait more if there is output available to process.

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

   * lisp/tls.el (tls-program): Doc fix.

2007-03-26  Richard Stallman  <rms@gnu.org>

   * texi/pgg.texi (Caching passphrase): Clean up previous change.

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

   * texi/gnus.texi (Setting Process Marks): Fix typo.

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

   * texi/gnus.texi (Splitting Mail): Reword "splitting"-as-adj to be -as-noun.

   * texi/gnus.texi (Mail Source Specifiers): Fix typo.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 796bcbf..2c2b925 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-27  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * message.el (message-yank-original): Fix bug:
+       Don't switch point and mark unnecessarily.
+
 2007-03-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * message.el (message-put-addresses-in-ecomplete): Only fetch headers
@@ -43,6 +48,15 @@
        * message.el (message-required-news-headers):
        * gnus-util.el (gnus-intern-safe): Fix typo in docstring.
 
+2007-03-18  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * tls.el (open-tls-stream): In handshake-waiting loop,
+       don't wait more if there is output available to process.
+
+2007-03-17  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * tls.el (tls-program): Doc fix.
+
 2007-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * message.el (message-generate-new-buffers): Change the meaning of the
@@ -91,7 +105,7 @@
 
 2007-02-24  John Paul Wallington  <jpw@pobox.com>
 
-       * net/tls.el (tls-certtool-program): Fix custom type.
+       * tls.el (tls-certtool-program): Fix custom type.
 
 2007-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -6641,7 +6655,7 @@
 
 2004-10-12  Simon Josefsson  <jas@extundo.com>
 
-       * net/tls.el (tls-certtool-program): New variable.
+       * tls.el (tls-certtool-program): New variable.
        (tls-certificate-information): New function, based on
        ssl-certificate-information.
 

diff --git a/lisp/message.el b/lisp/message.el
index 81126f5..f9cdc19 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3548,7 +3548,8 @@ Really top post? ")))
            (newline)
            (message-goto-body)
            (message-exchange-point-and-mark))
-       (message-exchange-point-and-mark))
+       (unless (< (point) (mark-marker))
+         (message-exchange-point-and-mark)))
       (unless (bolp)
        (insert ?\n))
       (unless modified

diff --git a/lisp/tls.el b/lisp/tls.el
index 3a9f19c..9de74ca 100644 (file)
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -60,7 +60,7 @@
                         "openssl s_client -connect %h:%p -no_ssl2")
   "List of strings containing commands to start TLS stream to a host.
 Each entry in the list is tried until a connection is successful.
-%s is replaced with server hostname, %p with port to connect to.
+%h is replaced with server hostname, %p with port to connect to.
 The program should read input on stdin and write output to
 stdout.  Also see `tls-success' for what the program should output
 after successful negotiation."
@@ -146,8 +146,8 @@ Fourth arg PORT is an integer specifying a port to connect to."
                      (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
                      (goto-char (point-min))
                      (not (setq done (re-search-forward tls-success nil t)))))
-         (accept-process-output process 1)
-         (sit-for 1))
+         (unless (accept-process-output process 1)
+            (sit-for 1)))
        (message "Opening TLS connection with `%s'...%s" cmd
                 (if done "done" "failed"))
        (if done

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 42d1272..c4dc74b 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -7,6 +7,20 @@
        * gnus.texi (Group Parameters): Document the posting-style merging
        process in topic-mode.
 
+2007-03-26  Richard Stallman  <rms@gnu.org>
+
+       * pgg.texi (Caching passphrase): Clean up previous change.
+
+2007-03-25  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * gnus.texi (Setting Process Marks): Fix typo.
+
+2007-03-24  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * gnus.texi (Splitting Mail): Reword "splitting"-as-adj to be -as-noun.
+
+       * gnus.texi (Mail Source Specifiers): Fix typo.
+
 2007-03-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus.texi (Scoring On Other Headers): Add gnus-inhibit-slow-scoring.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 7069d5a..db99884 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -6260,7 +6260,7 @@ Process marks are displayed as @code{#} in the summary buffer, and are
 used for marking articles in such a way that other commands will
 process these articles.  For instance, if you process mark four
 articles and then use the @kbd{*} command, Gnus will enter these four
-commands into the cache.  For more information,
+articles into the cache.  For more information,
 @pxref{Process/Prefix}.
 
 @table @kbd
@@ -13804,7 +13804,7 @@ function.
 
 @vindex nnmail-mail-splitting-charset
 @vindex nnmail-mail-splitting-decodes
-By default the splitting codes @acronym{MIME} decodes headers so you
+By default, splitting @acronym{MIME}-decodes headers so you
 can match on non-@acronym{ASCII} strings.  The
 @code{nnmail-mail-splitting-charset} variable specifies the default
 charset for decoding.  The behavior can be turned off completely by
@@ -13922,7 +13922,8 @@ TMP=$HOME/Mail/tmp
 rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP
 @end example
 
-Alter this script to fit find the @samp{movemail} you want to use.
+Alter this script to fit the @samp{movemail} and temporary
+file you want to use.
 
 
 @item directory

diff --git a/texi/pgg.texi b/texi/pgg.texi
index c1b192b..16de73f 100644 (file)
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -297,11 +297,11 @@ Elapsed time for expiration in seconds.
 @end defvar
 
 If your passphrase contains non-ASCII characters, you might need to
-specify the coding-system to be used to encode your passphrases since
-GnuPG treats them as a byte sequence not a character sequence.
+specify the coding system to be used to encode your passphrases, since
+GnuPG treats them as a byte sequence, not as a character sequence.
 
 @defvar pgg-passphrase-coding-system
-Coding-system used to encode passphrase.
+Coding system used to encode passphrase.
 @end defvar
 
 @node Default user identity