diff options
| author | Michael Albinus | 2011-10-19 22:21:35 +0200 |
|---|---|---|
| committer | Michael Albinus | 2011-10-19 22:21:35 +0200 |
| commit | 305c07f6ae3dbf10a6c069e2031fb4b0bca3d254 (patch) | |
| tree | 72c743f4da393eadfefefe925993e84843d66d1b | |
| parent | 13754b5435db15ac235e4637ca91c7447c151a5b (diff) | |
| download | emacs-305c07f6ae3dbf10a6c069e2031fb4b0bca3d254.tar.gz emacs-305c07f6ae3dbf10a6c069e2031fb4b0bca3d254.zip | |
* net/tramp.el (tramp-connectable-p): Make a stronger check on a
running process.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5db9b8a5241..4081805a509 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-10-19 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-connectable-p): Make a stronger check on a | ||
| 4 | running process. | ||
| 5 | |||
| 1 | 2011-10-19 Glenn Morris <rgm@gnu.org> | 6 | 2011-10-19 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * vc/vc-bzr.el (vc-bzr-after-dir-status): | 8 | * vc/vc-bzr.el (vc-bzr-after-dir-status): |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index cc4fda32dff..5fca1018095 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -2103,8 +2103,9 @@ This is true, if either the remote host is already connected, or if we are | |||
| 2103 | not in completion mode." | 2103 | not in completion mode." |
| 2104 | (and (tramp-tramp-file-p filename) | 2104 | (and (tramp-tramp-file-p filename) |
| 2105 | (with-parsed-tramp-file-name filename nil | 2105 | (with-parsed-tramp-file-name filename nil |
| 2106 | (or (get-buffer (tramp-buffer-name v)) | 2106 | (or (not (tramp-completion-mode-p)) |
| 2107 | (not (tramp-completion-mode-p)))))) | 2107 | (let ((p (tramp-get-connection-process v))) |
| 2108 | (and p (processp p) (memq (process-status p) '(run open)))))))) | ||
| 2108 | 2109 | ||
| 2109 | ;; Method, host name and user name completion. | 2110 | ;; Method, host name and user name completion. |
| 2110 | ;; `tramp-completion-dissect-file-name' returns a list of | 2111 | ;; `tramp-completion-dissect-file-name' returns a list of |