* pgg.el: Autoload url-insert-file-contents instead of loading w3/url.

(pgg-insert-url-with-w3): Don't load url here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57b9a05..3d80260 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+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-07  Jesper Harder  <harder@phys.au.dk>
 
        * message.el (message-kill-to-signature): Don't insert newline at

diff --git a/lisp/pgg.el b/lisp/pgg.el
index 588665c..5ba4bc2 100644 (file)
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -30,17 +30,11 @@
 (require 'pgg-def)
 (require 'pgg-parse)
 (require 'password)
+(autoload 'url-insert-file-contents "url")
 
 ;; 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
 ;;;
@@ -328,7 +322,6 @@ within the region."
 
 (defun pgg-insert-url-with-w3 (url)
   (ignore-errors
-    (require 'url)
     (let (buffer-file-name)
       (url-insert-file-contents url))))