(pgg-insert-url-with-w3): Don't load url here.
+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
2005-08-07 Jesper Harder <harder@phys.au.dk>
* message.el (message-kill-to-signature): Don't insert newline at
(require 'pgg-def)
(require 'pgg-parse)
(require 'password)
(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))
;; 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
;;;
;;; @ utility functions
;;;
(defun pgg-insert-url-with-w3 (url)
(ignore-errors
(defun pgg-insert-url-with-w3 (url)
(ignore-errors
(let (buffer-file-name)
(url-insert-file-contents url))))
(let (buffer-file-name)
(url-insert-file-contents url))))