Require password-cache or password.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e96ca3b2b541756edc25797c9524efb28243a6cd..eb6adaca886a068bd74224d2b9af7f3a17745853 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,8 @@
        (top-level): Don't require cl when compiling.
        (password-read-and-add): Doc fix.  Make obsolete.
 
+       * net/tramp.el: Require password-cache or password.
+
        * emulation/cua-base.el (top-level): Move (provide 'cua-base) to end.
        No longer provide 'cua.  Don't require cua-rect, cua-gmrk when
        compiling.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index ad80f11b8ae8a1f726d83f8aa4aab71a91e715c0..95959b15a7ce9e72203ff3cd89dab14f6db2326b 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -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)