* net/tramp.el (tramp-handle-shell-command): Use `display-buffer'.

Fixes: debbugs:18326

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8e6eb80f5d475176bdfb0cb09c84adec6010e16..c6a3f5d72828858541e552e8ec47e998a1a19546 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-28  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-handle-shell-command): Use `display-buffer'.
+       (Bug#18326)
+
 2014-08-28  Martin Rudalics  <rudalics@gmx.at>
 
        * scroll-bar.el (scroll-bar-horizontal-drag-1): Handle new

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 17259c691597bd0b069d601540c46126fb882ecf..5968a331b68d048d7998ff80de6c88c87f3c16c1 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3289,11 +3289,12 @@ User is always nil."
            ;; Run the process.
            (setq p (apply 'start-file-process "*Async Shell*" buffer args))
          ;; Display output.
-         (pop-to-buffer output-buffer)
-         (setq mode-line-process '(":%s"))
-         (shell-mode)
-         (set-process-sentinel p 'shell-command-sentinel)
-         (set-process-filter p 'comint-output-filter))
+         (with-current-buffer output-buffer
+           (display-buffer output-buffer '(nil (allow-no-window . t)))
+           (setq mode-line-process '(":%s"))
+           (shell-mode)
+           (set-process-sentinel p 'shell-command-sentinel)
+           (set-process-filter p 'comint-output-filter)))
 
       (prog1
          ;; Run the process.