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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 105)

   - Update from CVS

2005-08-22  Karl Chen  <quarl@cs.berkeley.edu>  (tiny change)

   * lisp/gnus/gnus-art.el (gnus-treatment-function-alist): Move date-lapsed to
   the end of the date treatments.

2005-08-15  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/pgg.el (url-insert-file-contents): Don't autoload it, Emacs has
   it in url-handlers.el and XEmacs in url.el.  Reported by Luca
   Capello and Romain Francoise.
   (pgg-fetch-key-function): Removed, not used?
   (pgg-insert-url-with-w3): Require url, to get
   url-insert-file-contents regardless of where it is defined.

2005-08-08  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/pgg.el: Autoload url-insert-file-contents instead of loading
   w3/url.
   (pgg-insert-url-with-w3): Don't load url here.

2005-08-19  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/emacs-mime.texi (time-date): Fix description of safe-date-to-time.

2005-08-18  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/emacs-mime.texi (Handles): Remove duplicate item.
   (Encoding Customization): Fix the default value for
   mm-coding-system-priorities.
   (Charset Translation): Emacs doesn't use mm-mime-mule-charset-alist.
   (Basic Functions): Fix reference.

2005-08-09  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Charsets): Fj hierarchy uses iso-2022-jp.

3 files changed, 21 insertions, 11 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a7b215718b0..cc85c51f5e2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,23 @@
+2005-08-22  Karl Chen  <quarl@cs.berkeley.edu>  (tiny change)
+
+        * gnus-art.el (gnus-treatment-function-alist): Move date-lapsed to
+        the end of the date treatments.
+
+2005-08-15  Simon Josefsson  <jas@extundo.com>
+
+        * pgg.el (url-insert-file-contents): Don't autoload it, Emacs has
+        it in url-handlers.el and XEmacs in url.el.  Reported by Luca
+        Capello and Romain Francoise.
+        (pgg-fetch-key-function): Removed, not used?
+        (pgg-insert-url-with-w3): Require url, to get
+        url-insert-file-contents regardless of where it is defined.
+
+2005-08-08  Simon Josefsson  <jas@extundo.com>
+
+        * pgg.el: Autoload url-insert-file-contents instead of loading
+        w3/url.
+        (pgg-insert-url-with-w3): Don't load url here.
+
 2005-08-05  Daiki Ueno <ueno@unixuser.org>
 
         * mml2015.el (mml2015-pgg-sign): Make sure micalg is correct.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 31874a19149..40476ec2f23 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1481,10 +1481,10 @@ This requires GNU Libidn, and by default only enabled if it is found."
     (gnus-treat-date-ut gnus-article-date-ut)
     (gnus-treat-date-local gnus-article-date-local)
     (gnus-treat-date-english gnus-article-date-english)
-    (gnus-treat-date-lapsed gnus-article-date-lapsed)
     (gnus-treat-date-original gnus-article-date-original)
     (gnus-treat-date-user-defined gnus-article-date-user)
     (gnus-treat-date-iso8601 gnus-article-date-iso8601)
+    (gnus-treat-date-lapsed gnus-article-date-lapsed)
     (gnus-treat-display-x-face gnus-article-display-x-face)
     (gnus-treat-display-face gnus-article-display-face)
     (gnus-treat-hide-headers gnus-article-maybe-hide-headers)
diff --git a/lisp/gnus/pgg.el b/lisp/gnus/pgg.el
index b61d1ad82ec..af59833c6c0 100644
--- a/lisp/gnus/pgg.el
+++ b/lisp/gnus/pgg.el
@@ -35,20 +35,10 @@
 ;; Don't merge these two `eval-when-compile's.
 (eval-when-compile
   (require 'cl))
-;; Fixme: This would be better done with an autoload for
-;; `url-insert-file-contents', and the url stuff rationalized.
-;; (`locate-library' can say whether the url code is available.)
-(eval-when-compile
-  (ignore-errors
-    (require 'w3)
-    (require 'url)))
 
 ;;; @ utility functions
 ;;;
 
-(defvar pgg-fetch-key-function (if (fboundp 'url-insert-file-contents)
-                                   (function pgg-fetch-key-with-w3)))
-
 (defun pgg-invoke (func scheme &rest args)
   (progn
     (require (intern (format "pgg-%s" scheme)))