[Emacs-diffs] /srv/bzr/emacs/trunk r108665: * net/ange-ftp.el (ange-ftp-get-passwd): Bind

[Michael Albinus]

------------------------------------------------------------
revno: 108665
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2012-06-20 08:51:53 +0200
message:
  * net/ange-ftp.el (ange-ftp-get-passwd): Bind
  `enable-recursive-minibuffers'.
  (ange-ftp-get-process): Throw if `non-essential' is non-nil.
modified:
  lisp/ChangeLog
  lisp/net/ange-ftp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-19 18:17:14 +0000
+++ b/lisp/ChangeLog    2012-06-20 06:51:53 +0000
@@ -1,3 +1,9 @@
+2012-06-20  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * ido.el (ido-find-file): Mention C-d binding in docstring (bug#11244).

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2012-06-17 18:54:39 +0000
+++ b/lisp/net/ange-ftp.el      2012-06-20 06:51:53 +0000
@@ -1230,7 +1230,8 @@
        ;; 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 @@
         (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