Mercurial > emacs

changeset 105248:ebd8445069df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Michael Albinus <michael.albinus@gmx.de>
date Mon, 28 Sep 2009 11:54:34 +0000
parents c23221ea3e52
children 99d98ed749b9
files lisp/net/tramp.el
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)