Synch to No Gnus 200603232352.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7726e5..60c00c9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,18 @@
        * mm-decode.el (mm-get-part): Add optional 'no-cache' argument.
        (mm-insert-part): Ditto.
 
+2006-03-23  Simon Josefsson  <jas@extundo.com>
+
+       * pgg-gpg.el (pgg-gpg-update-agent): Add again, with fixes from
+       Reiner.
+       (pgg-gpg-use-agent-p): Use it again.
+
+2006-03-23  Simon Josefsson  <jas@extundo.com>
+
+       * pgg-gpg.el (pgg-gpg-update-agent): Remove, doesn't work with
+       older emacsen.
+       (pgg-gpg-use-agent-p): Don't use it.
+
 2006-03-23  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * pgg-gpg.el (pgg-gpg-update-agent): Only use make-network-process