[Emacs-diffs] /srv/bzr/emacs/trunk r99395: * net/tramp-imap.el (top): Autoload needed packages.

[Michael Albinus]

------------------------------------------------------------
revno: 99395
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-22 22:17:11 +0100
message:
  * net/tramp-imap.el (top): Autoload needed packages.
modified:
  lisp/ChangeLog
  lisp/net/tramp-imap.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-22 16:43:54 +0000
+++ b/lisp/ChangeLog    2010-01-22 21:17:11 +0000
@@ -1,3 +1,7 @@
+2010-01-22  Michael Albinus  <address@hidden>
+
+       * net/tramp-imap.el (top): Autoload needed packages.
+
 2010-01-22  Stefan Monnier  <address@hidden>
 
        * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte

=== modified file 'lisp/net/tramp-imap.el'
--- a/lisp/net/tramp-imap.el    2010-01-13 08:35:10 +0000
+++ b/lisp/net/tramp-imap.el    2010-01-22 21:17:11 +0000
@@ -55,13 +55,24 @@
 (require 'assoc)
 (require 'tramp)
 (require 'tramp-compat)
-(require 'message)
-(require 'imap-hash)
-(require 'epa)
+(eval-when-compile (require 'imap-hash))
+
 (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 +673,8 @@
                  (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))