From fd48cd1850a268afab416e836cd3b333a7f6e31e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 4 Dec 2007 04:32:47 +0000 Subject: [PATCH] Require password-cache or password. --- lisp/ChangeLog | 2 ++ lisp/net/tramp.el | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e96ca3b2b54..eb6adaca886 100644 --- 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 ad80f11b8ae..95959b15a7c 100644 --- 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) -- 2.39.2