diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-02-18 19:29:28 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-02-18 19:29:28 -0800 |
| commit | 872faefb07a9196a583fc8cbe146ab6a2ebc9c2b (patch) | |
| tree | 5502bf8472fb7d132c03de2240ce403b502f8995 /lisp/net | |
| parent | 8ca4f1e02e22f74dc269b01bc4a32e01dd226dae (diff) | |
| parent | 2af3b9c16e340ad034e57e949f09bbafc00bd52c (diff) | |
| download | emacs-872faefb07a9196a583fc8cbe146ab6a2ebc9c2b.tar.gz emacs-872faefb07a9196a583fc8cbe146ab6a2ebc9c2b.tar.bz2 emacs-872faefb07a9196a583fc8cbe146ab6a2ebc9c2b.zip | |
Merge from emacs-24; up to 2012-12-20T16:09:05Z!dmantipov@yandex.ru
Diffstat (limited to 'lisp/net')
| -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 9be22352b23..7388c570874 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2784,7 +2784,11 @@ the result will be a local, non-Tramp, filename." (or (null program) tramp-process-connection-type)) (bmp (and (buffer-live-p buffer) (buffer-modified-p buffer))) (name1 name) - (i 0)) + (i 0) + ;; We do not want to raise an error when + ;; `start-file-process' has been started several time in + ;; `eshell' and friends. + (tramp-current-connection nil)) (unless buffer ;; BUFFER can be nil. We use a temporary buffer. |