Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 157-168)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
   - Update from CVS: texi/message.texi: Fix default values.

2005-12-08  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
   Suggest image/.* in the doc string.

2005-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
   RFC1524) if it is in mailcap or add a suffix according to
   mailcap-mime-extensions when generating a temp filename; postpone
   deleting a temp file for 2 seconds for some wrappers, shell
   scripts, and so on, which might exit right after having started a
   viewer command as a background job.

2005-12-06  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
   `function' to custom type.

2005-12-02  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)

   * lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
   parens.

2005-11-29  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
   long lines.
   (gnus-cache-delete-group): Wrap doc strings.

   * lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
   (gnus-agent-delete-group): Wrap doc strings.

2005-11-24  Pascal Rigaux  <pixel@mandriva.com>  (tiny change)

   * lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.

2005-11-22  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
   of current-time-string.

2005-11-20  Stefan Schimanski  <schimmi@debian.org>  (tiny change)

   * lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
   date header.

2005-11-16  Boris Samorodov <bsam@ipt.ru>  (tiny patch)

   * lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.

2005-11-14  Kevin Greiner  <kevin.greiner@compsol.cc>

   * lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
   internal variable to a custom variable.  Changed default value
   from compressed(2) to uncompressed(1).
   (gnus-agent-read-agentview): Reversed revision 7.8 to restore
   support for uncompressed agentview files.  Taken together, reading
   the agentview file should now be 6-7 times faster.
   (gnus-agent-long-article,
   gnus-agent-short-article, gnus-agent-score): Renamed category
   keywords to match gnus-cus.
   (gnus-agent-summary-fetch-series): Modified to protect against
   gnus-agent-summary-fetch-group clearing processable flags.
   (gnus-agent-synchronize-group-flags): Update live group buffer as
   synchronization may occur due to the user toggling the plugged
   status.
   (gnus-agent-braid-nov): Now tests new nov entries
   for duplicates which are removed.  The invalid sort check then
   triggers a rescan after the sort as sorting may have moved
   duplicate entries such that they can be cheaply detected.
   (gnus-agent-read-local): Trivial fix to format of
   error message to display actual error condition.
   (gnus-agent-save-local): Avoid saving symbols that are bound to
   nil as they simply result in a warning message in
   gnus-agent-read-local.
   (gnus-agent-fetch-group-1): Clear downloadable flag when article
   successfully downloaded.
   (gnus-agent-regenerate-group): Use
   gnus-agent-synchronize-group-flags to reset read status in both
   gnus and server.

   * lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
   (nntp-authinfo-rejected): New error condition.
   (nntp-wait-for): Use new error condition to signal authentication
   error.
   (nntp-retrieve-data): Rethrow new error condition to break out of
   recursive call to nntp-send-authinfo.

2005-11-13  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
   rather than make-variable-buffer-local for file-precious-flag.

2005-11-13  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.

2005-11-11  Jan Nieuwenhuizen  <janneke@gnu.org>

   * lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
   as a buffer-local variable.  This avoids creating truncated
   dribble files as a result of a hang up, eg.

2005-11-04 Ken Manheimer  <ken.manheimer@gmail.com>

   * lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
   (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
   (pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
   (pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
   argument to all these routines, so the passphrase can be managed
   externally and passed in to the system.
   (pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
   pgg-add-passphrase-to-cache function.

   * lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
   (pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
   (pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
   (pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
   argument to all these routines, so the passphrase can be managed
   externally and passed in to the system.
   (pgg-pgp5-sign-region): Use new name of	pgg-add-passphrase-to-cache
   function.

2005-10-30  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
   object.

2005-10-29  Ken Manheimer  <ken.manheimer@gmail.com>

   * lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
   part of the decoded armor to find the key-identifier.
   (pgg-gpg-lookup-key-owner): New function to return the
   human-readable identifier of a key owner.
   (pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
   key itself.
   (pgg-gpg-decrypt-region): Prompt with the key owner (rather than
   the key value) if we have a key and can match it against a secret
   key.  Also, added a note pointing out fact that the prompt only
   indicates the first matching key.

   * lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
   pgg-decrypt-region.
   (pgg-pending-timers): A new hash for tracking the passphrase cache
   timers, so that new ones supercede old ones.
   (pgg-add-passphrase-to-cache): Rename from
   `pgg-add-passphrase-cache' to reduce confusion (all callers
   changed).  Modified to cancel old timers when new ones are added.
   (pgg-remove-passphrase-from-cache): Rename from
   `pgg-remove-passphrase-cache' to reduce confusion (all callers
   changed).  Modified to cancel old timers when their keys are
   removed from the cache.
   (pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
   XEmacs, an indirection to delete-itimer.
   (pgg-read-passphrase-from-cache, pgg-read-passphrase):
   Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
   users can only check cache without risk of prompting.  Correct bug in
   notruncate behavior.
   (pgg-read-passphrase-from-cache, pgg-read-passphrase)
   (pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
   Add informative docstrings.
   (pgg-decrypt): Convey provided passphrase in subordinate call to
   pgg-decrypt-region.

2005-10-20  Ken Manheimer <ken.manheimer+emacs@gmail.com>

   * lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
   (pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
   (pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
   'passphrase' argument, so the passphrase can be managed externally
   and then passed in to the system.

   * lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
   (pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
   so the passphrase cache can be used reliably with identifiers
   besides a pgp packet's key id.

   * lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
   (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
   (pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
   (pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
   argument to all these routines, so the passphrase can be managed
   externally and passed in to the system.

   * lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
   'notruncate' argument, so the passphrase cache can be used
   reliably with identifiers besides a pgp packet's key id.

2005-10-29  Sascha Wilde  <swilde@sha-bang.de>

   * lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
   symmetric encryption.
   (pgg-gpg-symmetric-key-p): New function to check for an symmetric
   encrypted session key.
   (pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
   message ask for the passphrase in a proper way.

   * lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
   New user commands for symmetric encryption.

2005-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/pgg.texi (User Commands): Fix description of pgg-verify-region.
   (Selecting an implementation): Fix descriptions.

2005-11-30  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi (Various Message Variables): Addition.

2005-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi: Fix default values.

2005-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi (Header Commands): Clarify descriptions of
   message-cross-post-followup-to, message-reduce-to-to-cc, and
   message-insert-wide-reply.
   (Various Commands): Fix kindex for message-kill-to-signature;
   clarify description of message-tab.

2005-11-22  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi (Mailing Lists): Fix description about MFT.

   * man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.

2005-11-17  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Slow Terminal Connection): Replace old description
   with new one.

2005-11-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
   replace X-Draft-Headers with X-Draft-From.

2005-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Various Various): Fix the default value of
   nnheader-max-head-length.
   (Gnus Versions): Fix typo.

1 files changed, 8 insertions, 2 deletions

diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index ad913d441b7..1f0d1c91f49 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1872,9 +1872,15 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 	 (case-fold-search nil)
 	 (from (or (message-fetch-field "from") ""))
 	 (to (or (message-fetch-field "to") ""))
-	 (date (date-to-time
-		(or (message-fetch-field "date") (current-time-string))))
+	 (date (message-fetch-field "date"))
 	 (target 'delete))
+    (setq date (if date
+		   (condition-case err
+		       (date-to-time date)
+		     (error
+		      (message "%s" (error-message-string err))
+		      (current-time)))
+		 (current-time)))
     (dolist (regexp-target-pair (reverse nnmail-fancy-expiry-targets) target)
       (setq header (car regexp-target-pair))
       (cond