Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 566, 569, 576)

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

 * gnus--rel--5.10  (patch 184-185)

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

2006-12-17  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/pgg-gpg.el (pgg-gpg-use-agent): Default to t.

2006-12-24  Chong Yidong  <cyd@stupidchicken.com>

   * texi/pgg.texi (Caching passphrase): Default for pgg-gpg-use-agent changed
   to t.
   (Prerequisites): Add explanation about gpg-agent.

2006-12-17  Sascha Wilde  <wilde@sha-bang.de>

   * texi/pgg.texi: Added short note on gpg-agent to the introduction.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ceb5e4..6e2767a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -148,6 +148,10 @@
        * nnweb.el (nnweb-gmane-create-mapping): Keep the mapping stable for
        solid groups.
 
+2006-12-17  Chong Yidong  <cyd@stupidchicken.com>
+
+       * pgg-gpg.el (pgg-gpg-use-agent): Default to t.
+
 2006-12-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * legacy-gnus-agent.el: Add Copyright notice.

diff --git a/lisp/deuglify.el b/lisp/deuglify.el
index 83cf7fc..894e3c9 100644 (file)
--- a/lisp/deuglify.el
+++ b/lisp/deuglify.el
@@ -1,7 +1,7 @@
 ;;; deuglify.el --- deuglify broken Outlook (Express) articles
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-;; Copyright (C) 2001, 2002 Raymond Scholz
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;;   Free Software Foundation, Inc.
 
 ;; Author: Raymond Scholz <rscholz@zonix.de>
 ;;         Thomas Steffen (unwrapping algorithm,

diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el
index 86a9cb1..8fc5cff 100644 (file)
--- a/lisp/gnus-diary.el
+++ b/lisp/gnus-diary.el
@@ -1,7 +1,7 @@
 ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-;; Copyright (C) 1999, 2000, 2001 Didier Verna.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
 ;; Maintainer:    Didier Verna <didier@xemacs.org>

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 5cc48c5..4f3242e 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -50,7 +50,7 @@
   :type '(choice (const :tag "New `--recipient' option" "--recipient")
                 (const :tag "Old `--remote-user' option" "--remote-user")))
 
-(defcustom pgg-gpg-use-agent nil
+(defcustom pgg-gpg-use-agent t
   "Whether to use gnupg agent for key caching."
   :group 'pgg-gpg
   :type 'boolean)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index ef42c74..0a10a60 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -43,6 +43,16 @@
        (IMAP): Document nnimap-search-uids-not-since-is-evil and
        nnimap-nov-is-evil.
 
+2006-12-24  Chong Yidong  <cyd@stupidchicken.com>
+
+       * pgg.texi (Caching passphrase): Default for pgg-gpg-use-agent changed
+       to t.
+       (Prerequisites): Add explanation about gpg-agent.
+
+2006-12-17  Sascha Wilde  <wilde@sha-bang.de>
+
+       * pgg.texi: Added short note on gpg-agent to the introduction.
+
 2006-12-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus.texi (Hiding Headers): Document that `long-to' and `many-to'

diff --git a/texi/pgg.texi b/texi/pgg.texi
index e02eef7..891f44d 100644 (file)
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -74,10 +74,19 @@ PGG requires at least one implementation of privacy guard system.
 This document assumes that you have already obtained and installed them
 and that you are familiar with its basic functions.
 
-By default, PGG uses GnuPG, but Pretty Good Privacy version 2 or version
-5 are also supported.  If you are new to such a system, I recommend that
-you should look over the GNU Privacy Handbook (GPH) which is available
-at @uref{http://www.gnupg.org/gph/}.
+By default, PGG uses GnuPG.  If you are new to such a system, I
+recommend that you should look over the GNU Privacy Handbook (GPH)
+which is available at @uref{http://www.gnupg.org/documentation/}.
+
+When using GnuPG, we recommend the use of the @code{gpg-agent}
+program, which is distributed with versions 2.0 and later of GnuPG.
+This is a daemon to manage private keys independently from any
+protocol, and provides the most secure way to input and cache your
+passphrases (@pxref{Caching passphrase}).  By default, PGG will
+attempt to use @code{gpg-agent} if it is running.  @xref{Invoking
+GPG-AGENT,,,gnupg,Using the GNU Privacy Guard}.
+
+PGG also supports Pretty Good Privacy version 2 or version 5.
 
 @node How to use
 @chapter How to use
@@ -238,8 +247,8 @@ Elapsed time for expiration in seconds.
 When using GnuPG (gpg) as PGP scheme you can use @code{gpg-agent} for
 caching@footnote{Actually @code{gpg-agent} does not cache passphrases
 but private keys.  On the other hand, from a users point of view this
-technical difference isn't visible.}.  If non-@code{nil} try to use a
-running @code{gpg-agent}.  It defaults to @code{nil}.
+technical difference isn't visible.}.  It defaults to @code{t}.
+Setting this to @code{nil} is not recommended.
 @end defvar
 
 @node Default user identity