From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 10 Feb 2020 18:59:49 +0000 (+0100)
Subject: Fix window position in Tramp's shell-command
X-Git-Tag: emacs-28.0.90~7897
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e2f53907103d801fb57dc0eef55906cdf4d791b;p=emacs.git

Fix window position in Tramp's shell-command

* lisp/net/tramp.el (tramp-handle-shell-command): Fix `window-start'
in output buffer.  (Bug#39171)
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 19d36c3a97b..0e44656f2a4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3721,9 +3721,9 @@ support symbolic links."
 	    (if (process-live-p p)
 	      ;; Display output.
 	      (with-current-buffer output-buffer
-		(display-buffer output-buffer '(nil (allow-no-window . t)))
 		(setq mode-line-process '(":%s"))
-		(shell-mode)
+		(unless (eq major-mode 'shell-mode)
+		  (shell-mode))
 		(set-process-filter p #'comint-output-filter)
 		(set-process-sentinel p #'shell-command-sentinel)
 		(when error-file
@@ -3733,7 +3733,8 @@ support symbolic links."
 		     (with-current-buffer error-buffer
 		       (insert-file-contents-literally
 			error-file nil nil nil 'replace))
-		     (delete-file error-file)))))
+		     (delete-file error-file))))
+		(display-buffer output-buffer '(nil (allow-no-window . t))))
 
 	      (when error-file
 		(delete-file error-file)))))