From: Michael Albinus Date: Wed, 20 Jun 2012 06:51:53 +0000 (+0200) Subject: * net/ange-ftp.el (ange-ftp-get-passwd): Bind X-Git-Tag: emacs-24.2.90~1199^2~422 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=493c66882d491bcd6178e580abea92787f3e1555;p=emacs.git * 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 9146b523a43..494ea5a13ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-06-20 Michael Albinus + + * 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 (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 4ca40fdabef..6ac01a1cd69 100644 --- 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