Synch to No Gnus 200502150045.

[elisp/gnus.git-] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e48d3c..d5d5f10 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,45 @@
+2005-02-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el: Avoid "Recursive load suspected" error in Emacs 21.1.
+
+2005-02-14  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * gnus.el (spam-contents): improve docs for spam-contents
+       parameter in its variable incarnation
+
+2005-02-14  Simon Josefsson  <jas@extundo.com>
+
+       * smime-ldap.el: Use require instead of load-library for ldap.
+       (smime-ldap-search): Indent.
+       (smime-ldap-search-internal): Shorten line.
+
+       * smime.el (smime-cert-by-dns): Add doc-string.
+       (smime-cert-by-ldap-1): Indent.
+
+       * mml-smime.el (mml-smime-get-ldap-cert): Renamed from
+       mml-smime-get-dns-ldap.
+       (mml-smime-encrypt-query): Use new function.  Default to ldap.
+
+2005-02-14  Arne J\e,Ax\e(Brgensen <arne@arnested.dk>
+
+       * smime.el: Require smime-ldap.
+       (smime-ldap-host-list): New variable.
+       (smime-cert-by-ldap, smime-cert-by-ldap-1): Likewise.
+
+       * mml-smime.el (mml-smime-encrypt-query): New function.
+       (mml-smime-encrypt-query): Use it.
+
+       * smime-ldap.el: New file.
+
+2005-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-agent.el: Remove garbage made while merging the Emacs trunk.
+
+2005-02-09  Kim F. Storm  <storm@cua.dk>
+
+       Change Emacs release version from 21.4 to 22.1 throughout.
+       Change Emacs development version from 21.3.50 to 22.0.50.
+
 2005-02-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-mime-copy-part): Don't decode compressed parts.
@@ -850,7 +892,6 @@
        * hashcash.el: Fix URL in comment, reported by Cheng Gao
        <chenggao@gmail.com>.
 
->>>>>>> 7.511
 2004-10-25  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * html2text.el (html2text-buffer-head): Remove.  Use `goto-char'
@@ -4247,7 +4288,7 @@
        * pgg-gpg.el (pgg-gpg-lookup-all-secret-keys)
        (pgg-gpg-lookup-key): Use regexp match instead of
        split-string (split-string is different between emacs 21.2 and
-       21.4).  Reported by ultrasoul@ultrasoul.com (David D. Smith).
+       22.1).  Reported by ultrasoul@ultrasoul.com (David D. Smith).
 
 2004-01-08  Jesper Harder  <harder@ifa.au.dk>