[Emacs-diffs] emacs/lisp/net tramp.el

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/09/28 11:54:35

Modified files:
        lisp/net       : tramp.el 

Log message:
        *** empty log message ***

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.255&r2=1.256

Patches:
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -b -r1.255 -r1.256
--- tramp.el    6 Sep 2009 14:18:54 -0000       1.255
+++ tramp.el    28 Sep 2009 11:54:34 -0000      1.256
@@ -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)