diff options
| author | Michael Albinus | 2017-01-07 18:51:30 +0100 |
|---|---|---|
| committer | Michael Albinus | 2017-01-07 18:51:30 +0100 |
| commit | 77f35363fd9bb743716a196a3168fa94d896c28e (patch) | |
| tree | 75f50a240bec0c6049d560d5c64f8805469a5bb3 | |
| parent | 75cdf429179c6459c10f15578fb32236a8821e4b (diff) | |
| download | emacs-77f35363fd9bb743716a196a3168fa94d896c28e.tar.gz emacs-77f35363fd9bb743716a196a3168fa94d896c28e.zip | |
Fix a problem with `start-file-process' in Tramp
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
`start-file-process' shall work when `non-essential' is
non-nil, but there is already an established connection.
<https://github.com/company-mode/company-mode/issues/462>
| -rw-r--r-- | lisp/net/tramp-sh.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index fec9f10d704..71a388767d0 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -4655,7 +4655,11 @@ connection if a previous connection has died for some reason." | |||
| 4655 | 4655 | ||
| 4656 | ;; If `non-essential' is non-nil, don't reopen a new connection. | 4656 | ;; If `non-essential' is non-nil, don't reopen a new connection. |
| 4657 | ;; This variable has been introduced with Emacs 24.1. | 4657 | ;; This variable has been introduced with Emacs 24.1. |
| 4658 | (when (and (boundp 'non-essential) (symbol-value 'non-essential)) | 4658 | ;; We check this for the process related to |
| 4659 | ;; `tramp-buffer-name'; otherwise `start-file-process' | ||
| 4660 | ;; wouldn't run ever when `non-essential' is non-nil. | ||
| 4661 | (when (and (boundp 'non-essential) (symbol-value 'non-essential) | ||
| 4662 | (null (get-process (tramp-buffer-name vec)))) | ||
| 4659 | (throw 'non-essential 'non-essential)) | 4663 | (throw 'non-essential 'non-essential)) |
| 4660 | 4664 | ||
| 4661 | (with-tramp-progress-reporter | 4665 | (with-tramp-progress-reporter |