# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1196742741 0
# Node ID dcdf399ba8a408e6a3faa7be1cc4fcd06aa28776
# Parent  c7d386687d80247a2872e63078449399f9e65f1f
Require password-cache or password.

diff -r c7d386687d80 -r dcdf399ba8a4 lisp/net/tramp.el
--- a/lisp/net/tramp.el	Tue Dec 04 04:14:30 2007 +0000
+++ b/lisp/net/tramp.el	Tue Dec 04 04:32:21 2007 +0000
@@ -83,7 +83,8 @@
 ;; be mandatory
 (if (featurep 'xemacs)
     (load "password" 'noerror)
-  (require 'password nil 'noerror))     ;from No Gnus, also in tar ball
+  (or (require 'password-cache nil 'noerror)
+      (require 'password nil 'noerror))) ; from No Gnus, also in tar ball
 
 (require 'shell)
 (require 'advice)