Merge from gnus--rel--5.10

Patches applied:

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

   - Update from CVS

2007-03-20  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/message.el (message-required-news-headers):
   * lisp/gnus-util.el (gnus-intern-safe): Fix typo in docstring.

2007-03-15  Daiki Ueno  <ueno@unixuser.org>

   * texi/pgg.texi (Caching passphrase): Describe pgg-passphrase-coding-system.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7fc2b8..256f37f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-20  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * message.el (message-required-news-headers):
+       * gnus-util.el (gnus-intern-safe): Fix typo in docstring.
+
 2007-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * message.el (message-generate-new-buffers): Change the meaning of the

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index dd6bf91..7e94d4e 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -103,7 +103,7 @@ This is a compatibility function for different Emacsen."
 (put 'gnus-eval-in-buffer-window 'edebug-form-spec '(form body))
 
 (defmacro gnus-intern-safe (string hashtable)
-  "Set hash value.  Arguments are STRING, VALUE, and HASHTABLE."
+  "Get hash value.  Arguments are STRING and HASHTABLE."
   `(let ((symbol (intern ,string ,hashtable)))
      (or (boundp symbol)
         (set symbol nil))

diff --git a/lisp/message.el b/lisp/message.el
index 16cb386..dad2550 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -223,7 +223,7 @@ Also see `message-required-news-headers' and
   "*Headers to be generated or prompted for when posting an article.
 RFC977 and RFC1036 require From, Date, Newsgroups, Subject,
 Message-ID.  Organization, Lines, In-Reply-To, Expires, and
-User-Agent are optional.  If don't you want message to insert some
+User-Agent are optional.  If you don't want message to insert some
 header, remove it from this list."
   :group 'message-news
   :group 'message-headers

diff --git a/texi/ChangeLog b/texi/ChangeLog
index f6de31d..729c5a6 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -3,6 +3,10 @@
        * message.texi (Message Buffers): Update documentation for
        message-generate-new-buffers.
 
+2007-03-15  Daiki Ueno  <ueno@unixuser.org>
+
+       * pgg.texi (Caching passphrase): Describe pgg-passphrase-coding-system.
+
 2007-03-11  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
        * gnus.texi (Mail and Post): Update documentation for gnus-user-agent.

diff --git a/texi/message.texi b/texi/message.texi
index 67ac1e5..f1cdb46 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -2233,6 +2233,8 @@ type, the To address and the group name (any of these may be
 @code{nil}).  The function should return the new buffer name.
 @end table
 
+The default value is @code{unique}.
+
 @item message-max-buffers
 @vindex message-max-buffers
 This variable says how many old message buffers to keep.  If there are

diff --git a/texi/pgg.texi b/texi/pgg.texi
index 1cf30be..c1b192b 100644 (file)
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -296,6 +296,14 @@ variable to @code{nil}.
 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.
+
+@defvar pgg-passphrase-coding-system
+Coding-system used to encode passphrase.
+@end defvar
+
 @node Default user identity
 @section Default user identity