# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1254138874 0
# Node ID ebd8445069dfc7506fa5941dd9d60fba47b44d6d
# Parent  c23221ea3e521351b7b59490448f92c98148f180
*** empty log message ***

diff -r c23221ea3e52 -r ebd8445069df lisp/net/tramp.el
--- a/lisp/net/tramp.el	Mon Sep 28 04:33:42 2009 +0000
+++ b/lisp/net/tramp.el	Mon Sep 28 11:54:34 2009 +0000
@@ -151,7 +151,12 @@
 	   'tramp-gvfs)
 
 	 ;; Load gateways.  It needs `make-network-process' from Emacs 22.
-	 (when (functionp 'make-network-process) 'tramp-gw)))
+	 (when (functionp 'make-network-process) 'tramp-gw)
+
+	 ;; tramp-imap needs both epa (from Emacs 23.1) and imap-hash
+	 ;; (from Emacs 23.2).
+	 (when (and (locate-library "epa") (locate-library "imap-hash"))
+	   'tramp-imap)))
 
      (when feature
        ;; We have used just some basic tests, whether a package shall
@@ -3788,7 +3793,7 @@
 		(if (memq (char-after end) '(?\n ?\ ))
 		    ;; End is followed by \n or by " -> ".
 		    (put-text-property start end 'dired-filename t)))))
-	  ;; Reove training lines.
+	  ;; Remove trailing lines.
 	  (goto-char (tramp-compat-line-beginning-position))
 	  (while (looking-at "//")
 	    (forward-line 1)