From: Juri Linkov <juri@linkov.net>
Date: Mon, 1 Mar 2021 19:56:42 +0000 (+0200)
Subject: * lisp/tab-bar.el (tab-bar--define-keys): Add check for tab-bar-format-global.
X-Git-Tag: emacs-28.0.90~3474
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6268c9ba6e2cad11837181a3e75c805b73619a0b;p=emacs.git

* lisp/tab-bar.el (tab-bar--define-keys): Add check for tab-bar-format-global.
---

diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index c3955913e2d..d93ee9c93f1 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -117,8 +117,9 @@ Possible modifier keys are `control', `meta', `shift', `hyper', `super' and
 
   ;; Replace default value with a condition that supports displaying
   ;; global-mode-string in the tab bar instead of the mode line.
-  (when (member '(global-mode-string ("" global-mode-string " "))
-                mode-line-misc-info)
+  (when (and (memq 'tab-bar-format-global tab-bar-format)
+             (member '(global-mode-string ("" global-mode-string " "))
+                     mode-line-misc-info))
     (setq mode-line-misc-info
           (append '(global-mode-string
                     ("" (:eval (if (and tab-bar-mode