procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/tramp.el (top): Quote feature names. Remove

Browse source 
`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.
This commit is contained in:
Michael Albinus 2008-06-08 10:49:19 +00:00
parent b8206d82a5
commit 48846dc595
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -1,3 +1,13 @@
2008-06-08 Michael Albinus <michael.albinus@gmx.de>
* uniquify.el (uniquify-get-proposed-name): Handle remote files.
* 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.
2008-06-08 Andreas Schwab <schwab@suse.de>
* window.el (display-buffer): Use lru window if current window

24
lisp/net/tramp.el
View file

@ -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 @@ special handling of `substitute-in-file-name'."
(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 @@ Invokes `password-read' if available, `read-passwd' else."
(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)))