* 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.

2 files changed, 22 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a5b4058b5e..3cef51e02d8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index a026b45c4d2..546bb69b02f 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -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)))