* net/ange-ftp.el (ange-ftp-get-passwd): Bind

`enable-recursive-minibuffers'.
(ange-ftp-get-process): Throw if `non-essential' is non-nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9146b523a4344207369847f0c23c4b1e397fc1ae..494ea5a13ca0d45a4a67e09f98d2e3ee9287b930 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-20  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/ange-ftp.el (ange-ftp-get-passwd): Bind
+       `enable-recursive-minibuffers'.
+       (ange-ftp-get-process): Throw if `non-essential' is non-nil.
+
 2012-06-19  David Röthlisberger  <david@rothlis.net>  (tiny change)
 
        * ido.el (ido-find-file): Mention C-d binding in docstring (bug#11244).

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 4ca40fdabef3a9d3bca2c998c3ef8ffe8afc1ad0..6ac01a1cd69509a68ed457ce001224bdf54dde33 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1230,7 +1230,8 @@ only return the directory part of FILE."
        ;; see if same user has logged in to other hosts; if so then prompt
        ;; with the password that was used there.
        (t
-        (let* ((other (ange-ftp-get-host-with-passwd user))
+        (let* ((enable-recursive-minibuffers t)
+               (other (ange-ftp-get-host-with-passwd user))
                (passwd (if other
 
                            ;; found another machine with the same user.
@@ -2131,6 +2132,11 @@ Create a new process if needed."
         (proc (get-process name)))
     (if (and proc (memq (process-status proc) '(run open)))
        proc
+      ;; If `non-essential' is non-nil, don't reopen a new connection.  It
+      ;; will be catched in Tramp.
+      (when non-essential
+       (throw 'non-essential 'non-essential))
+
       ;; Must delete dead process so that new process can reuse the name.
       (if proc (delete-process proc))
       (let ((pass (ange-ftp-quote-string