aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2008-07-24 21:46:20 +0000
committerMichael Albinus2008-07-24 21:46:20 +0000
commit38d63e6af4aa0be39c08f9ca086a21c930840e26 (patch)
tree69ea0b93b41d9d7a639e2724b5186d3baa88365d
parent24008bc4f3ed8e6068e90e184b2dd7dccf83ac5b (diff)
downloademacs-38d63e6af4aa0be39c08f9ca086a21c930840e26.tar.gz
emacs-38d63e6af4aa0be39c08f9ca086a21c930840e26.zip
* net/tramp.el (tramp-handle-start-file-process): Make NAME a unique
process name. Reported by Markus Triska <markus.triska@gmx.at>.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/net/tramp.el8
2 files changed, 14 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4e89c4264f..79f680ec932 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12008-07-24 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el (tramp-handle-start-file-process): Make NAME a unique
4 process name. Reported by Markus Triska <markus.triska@gmx.at>.
5
6 * net/xesam.el: New file.
7
12008-07-24 Sven Joachim <svenjoac@gmx.de> 82008-07-24 Sven Joachim <svenjoac@gmx.de>
2 9
3 * dired-aux.el (dired-copy-file-recursive): Avoid calling 10 * dired-aux.el (dired-copy-file-recursive): Avoid calling
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b7792b0e90f..17cc5938042 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3677,11 +3677,17 @@ beginning of local filename are not substituted."
3677 "Like `start-file-process' for Tramp files." 3677 "Like `start-file-process' for Tramp files."
3678 (with-parsed-tramp-file-name default-directory nil 3678 (with-parsed-tramp-file-name default-directory nil
3679 (unwind-protect 3679 (unwind-protect
3680 (progn 3680 (let ((name1 name)
3681 (i 0))
3681 (unless buffer 3682 (unless buffer
3682 ;; BUFFER can be nil. We use a temporary buffer, which is 3683 ;; BUFFER can be nil. We use a temporary buffer, which is
3683 ;; killed in `tramp-process-sentinel'. 3684 ;; killed in `tramp-process-sentinel'.
3684 (setq buffer (generate-new-buffer tramp-temp-buffer-name))) 3685 (setq buffer (generate-new-buffer tramp-temp-buffer-name)))
3686 (while (get-process name1)
3687 ;; NAME must be unique as process name.
3688 (setq i (1+ i)
3689 name1 (format "%s<%d>" name i)))
3690 (setq name name1)
3685 ;; Set the new process properties. 3691 ;; Set the new process properties.
3686 (tramp-set-connection-property v "process-name" name) 3692 (tramp-set-connection-property v "process-name" name)
3687 (tramp-set-connection-property v "process-buffer" buffer) 3693 (tramp-set-connection-property v "process-buffer" buffer)