[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v |
Date: |
Sun, 08 Jun 2008 10:47:45 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 08/06/08 10:47:44
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -b -r1.199 -r1.200
--- tramp.el 17 May 2008 20:09:47 -0000 1.199
+++ tramp.el 8 Jun 2008 10:47:43 -0000 1.200
@@ -144,8 +144,8 @@
(require feature)
(add-hook 'tramp-unload-hook
`(lambda ()
- (when (featurep ,feature)
- (unload-feature ,feature 'force)))))))
+ (when (featurep (quote ,feature))
+ (unload-feature (quote ,feature) 'force)))))))
;;; User Customizable Internal Variables:
@@ -2094,7 +2094,11 @@
(when (boundp 'rfn-eshadow-setup-minibuffer-hook)
(add-hook 'rfn-eshadow-setup-minibuffer-hook
- 'tramp-rfn-eshadow-setup-minibuffer))
+ 'tramp-rfn-eshadow-setup-minibuffer)
+ (add-hook 'tramp-unload-hook
+ '(lambda ()
+ (remove-hook 'rfn-eshadow-setup-minibuffer-hook
+ 'tramp-rfn-eshadow-setup-minibuffer))))
(defun tramp-rfn-eshadow-update-overlay ()
"Update `rfn-eshadow-overlay' to cover shadowed part of minibuffer input.
@@ -7218,16 +7222,12 @@
(format "%s for %s " (capitalize (match-string 1)) key)))))
(or
- ;; see if auth-sources contains something useful, if it's bound
+ ;; See if auth-sources contains something useful, if it's bound.
(when (boundp 'auth-sources)
- (or
- ;; 1. try with Tramp's current method
- (auth-source-user-or-password
- "password" tramp-current-host tramp-current-method)
- ;; 2. hard-code the method to be "tramp"
- (auth-source-user-or-password
- "password" tramp-current-host "tramp")))
- ;; 3. else, get the password interactively
+ ;; Try with Tramp's current method.
+ (funcall (symbol-function 'auth-source-user-or-password)
+ "password" tramp-current-host tramp-current-method))
+ ;; Else, get the password interactively.
(if (functionp 'password-read)
(let ((password (funcall (symbol-function 'password-read)
pw-prompt key)))
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v,
Michael Albinus <=
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v, Michael Albinus, 2008/06/15
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v, Michael Albinus, 2008/06/15
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v, Glenn Morris, 2008/06/26
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v, Michael Albinus, 2008/06/28