From 5dbad8dd39996dd1b5d355f838efa147e51d413b Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Wed, 26 Apr 2006 22:27:14 +0000
Subject: [PATCH] Revision: emacs@sv.gnu.org/gnus--devo--0--patch-135

Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 229, 232, 235, 238)

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

 * gnus--rel--5.10  (patch 91-95)

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

2006-04-26  Reiner Steib  <Reiner.Steib@gmx.de>

   * texi/pgg.texi (Caching passphrase): Fix markup and typos. Simplify.

2006-04-26  Sascha Wilde  <wilde@sha-bang.de>

   * texi/pgg.texi (Caching passphrase): Added documentation for
   pgg-gpg-use-agent.
---
 lisp/message.el | 10 +++++-----
 texi/ChangeLog  |  9 +++++++++
 texi/pgg.texi   |  8 ++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lisp/message.el b/lisp/message.el
index 5ad7fcc0b..4cd1252d7 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2816,17 +2816,17 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
   (or (search-forward (concat "\n" mail-header-separator "\n") nil t)
       (search-forward-regexp "[^:]+:\\([^\n]\\|\n[ \t]\\)+\n\n" nil t)))
 
+(defun message-in-body-p ()
+  "Return t if point is in the message body."
+  (let ((body (save-excursion (message-goto-body) (point))))
+    (>= (point) body)))
+
 (defun message-goto-eoh ()
   "Move point to the end of the headers."
   (interactive)
   (message-goto-body)
   (forward-line -1))
 
-(defun message-in-body-p ()
-  "Return t if point is in the message body."
-  (let ((body (save-excursion (message-goto-body) (point))))
-    (>= (point) body)))
-
 (defun message-goto-signature ()
   "Move point to the beginning of the message signature.
 If there is no signature in the article, go to the end and
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 1e0007f69..35f0769a6 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -2,6 +2,15 @@
 
 	* gnus.texi (Spam Package Introduction): Fix spam menu and links. 
 
+2006-04-26  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* pgg.texi (Caching passphrase): Fix markup and typos.  Simplify.
+
+2006-04-26  Sascha Wilde  <wilde@sha-bang.de>
+
+	* pgg.texi (Caching passphrase): Added documentation for
+	pgg-gpg-use-agent.
+
 2006-04-20  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus.texi (Spam Statistics Package): Fix typo in @pxref.
diff --git a/texi/pgg.texi b/texi/pgg.texi
index f4fe0a01e..026d225c7 100644
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -234,6 +234,14 @@ variable to @code{nil}.
 Elapsed time for expiration in seconds.
 @end defvar
 
+@defvar pgg-gpg-use-agent
+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}.
+@end defvar
+
 @node Default user identity
 @section Default user identity
 
-- 
2.25.1