diff options
| author | Michael Albinus | 2014-08-28 21:31:11 +0200 |
|---|---|---|
| committer | Michael Albinus | 2014-08-28 21:31:11 +0200 |
| commit | 0f8fb0b98a85cf0dcf266b3963c20363fb3e1955 (patch) | |
| tree | 2edf9a5e246410d51692847091f9b2018b56a371 | |
| parent | cd19ba4c005a230b728469a5ac6e23285957ed67 (diff) | |
| download | emacs-0f8fb0b98a85cf0dcf266b3963c20363fb3e1955.tar.gz emacs-0f8fb0b98a85cf0dcf266b3963c20363fb3e1955.zip | |
* net/tramp.el (tramp-handle-shell-command): Use `display-buffer'.
Fixes: debbugs:18326
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a8e6eb80f5d..c6a3f5d7282 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-08-28 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-handle-shell-command): Use `display-buffer'. | ||
| 4 | (Bug#18326) | ||
| 5 | |||
| 1 | 2014-08-28 Martin Rudalics <rudalics@gmx.at> | 6 | 2014-08-28 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * scroll-bar.el (scroll-bar-horizontal-drag-1): Handle new | 8 | * scroll-bar.el (scroll-bar-horizontal-drag-1): Handle new |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 17259c69159..5968a331b68 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -3289,11 +3289,12 @@ User is always nil." | |||
| 3289 | ;; Run the process. | 3289 | ;; Run the process. |
| 3290 | (setq p (apply 'start-file-process "*Async Shell*" buffer args)) | 3290 | (setq p (apply 'start-file-process "*Async Shell*" buffer args)) |
| 3291 | ;; Display output. | 3291 | ;; Display output. |
| 3292 | (pop-to-buffer output-buffer) | 3292 | (with-current-buffer output-buffer |
| 3293 | (setq mode-line-process '(":%s")) | 3293 | (display-buffer output-buffer '(nil (allow-no-window . t))) |
| 3294 | (shell-mode) | 3294 | (setq mode-line-process '(":%s")) |
| 3295 | (set-process-sentinel p 'shell-command-sentinel) | 3295 | (shell-mode) |
| 3296 | (set-process-filter p 'comint-output-filter)) | 3296 | (set-process-sentinel p 'shell-command-sentinel) |
| 3297 | (set-process-filter p 'comint-output-filter))) | ||
| 3297 | 3298 | ||
| 3298 | (prog1 | 3299 | (prog1 |
| 3299 | ;; Run the process. | 3300 | ;; Run the process. |