Mercurial > emacs
changeset 95659:926453fe3d68
* net/tramp.el (top): Quote feature names. Remove
`tramp-rfn-eshadow-setup-minibuffer' from
`rfn-eshadow-setup-minibuffer-hook' when unloading.
(tramp-read-passwd): There is only one call to
`auth-source-user-or-password' needed. Pacify byte compiler.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sun, 08 Jun 2008 10:47:43 +0000 |
| parents | ad3644a3612d |
| children | 048996b7366b |
| files | lisp/net/tramp.el |
| diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/tramp.el Sun Jun 08 10:42:34 2008 +0000 +++ b/lisp/net/tramp.el Sun Jun 08 10:47:43 2008 +0000 @@ -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)))