From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 11 Aug 2020 14:46:41 +0000 (+0200)
Subject: * lisp/net/tramp.el: Make last change backward compatible.
X-Git-Tag: emacs-28.0.90~6688
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=119a9ecfe1183f3b6f99a885689d10739687dcc8;p=emacs.git

* lisp/net/tramp.el: Make last change backward compatible.
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index fdf26f6b782..d8113a9af9b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3814,9 +3814,12 @@ support symbolic links."
 	    (setq current-buffer-p t)
 	    (current-buffer))
 	   (t (get-buffer-create
+	       ;; These variables have been introduced with Emacs 28.1.
 	       (if asynchronous
-		   shell-command-buffer-name-async
-		 shell-command-buffer-name)))))
+		   (or (bound-and-true-p shell-command-buffer-name-async)
+		       "*Async Shell Command*")
+		 (or (bound-and-true-p shell-command-buffer-name)
+		     "*Shell Command Output*"))))))
 	 (error-buffer
 	  (cond
 	   ((bufferp error-buffer) error-buffer)