From 411d06c27c0e7f3e9d94fef1d11822b2035b907d Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 22 Jan 2010 22:19:50 +0100 Subject: [PATCH] * net/tramp-imap.el (top): Autoload needed packages. --- lisp/ChangeLog | 4 ++++ lisp/net/tramp-imap.el | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c59ecbae67b..65e171c1381 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-01-22 Michael Albinus + + * net/tramp-imap.el (top): Autoload needed packages. + 2010-01-22 Stefan Monnier * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte diff --git a/lisp/net/tramp-imap.el b/lisp/net/tramp-imap.el index da75e2307ca..6f20d527713 100644 --- a/lisp/net/tramp-imap.el +++ b/lisp/net/tramp-imap.el @@ -55,13 +55,23 @@ (require 'assoc) (require 'tramp) (require 'tramp-compat) -(require 'message) -(require 'imap-hash) -(require 'epa) + (autoload 'auth-source-user-or-password "auth-source") +(autoload 'epg-context-operation "epg") +(autoload 'epg-context-set-armor "epg") +(autoload 'epg-context-set-passphrase-callback "epg") +(autoload 'epg-context-set-progress-callback "epg") +(autoload 'epg-decrypt-string "epg") +(autoload 'epg-encrypt-string "epg") +(autoload 'imap-hash-get "imap-hash") +(autoload 'imap-hash-make "imap-hash") +(autoload 'imap-hash-map "imap-hash") +(autoload 'imap-hash-put "imap-hash") +(autoload 'imap-hash-rem "imap-hash") ;; We use the additional header "X-Size" for encoding the size of a file. -(add-to-list 'imap-hash-headers 'X-Size 'append) +(eval-after-load "imap-hash" + '(add-to-list 'imap-hash-headers 'X-Size 'append)) ;; Define Tramp IMAP method ... (defconst tramp-imap-method "imap" @@ -662,7 +672,8 @@ KEY-ID can be 'SYM or 'PIN among others." (read-passwd (if (eq key-id 'PIN) "Tramp-IMAP passphrase for PIN: " - (let ((entry (assoc key-id epg-user-id-alist))) + (let ((entry (assoc key-id + (symbol-value 'epg-user-id-alist)))) (if entry (format "Tramp-IMAP passphrase for %s %s: " key-id (cdr entry)) -- 2.39.5