From: Bastian Beranek <bastian.beischer@rwth-aachen.de>
Date: Tue, 16 Feb 2021 10:35:35 +0000 (+0100)
Subject: * lisp/tab-bar.el: Fix behavior of toggle-frame-tab-bar (bug #46299)
X-Git-Tag: emacs-28.0.90~3699
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=12b80948fd2fc599b9ea4cc6497c007205b3e57e;p=emacs.git

* lisp/tab-bar.el: Fix behavior of toggle-frame-tab-bar (bug #46299)

(toggle-frame-tab-bar): Add frame parameter to protect tab bar state.
(tab-bar--update-tab-bar-lines): Check parameter.
---

diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 4e47ae2c10e..f0210e1a42b 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -161,7 +161,8 @@ update."
                          (t frames))))
     ;; Loop over all frames and update default-frame-alist
     (dolist (frame frame-lst)
-      (set-frame-parameter frame 'tab-bar-lines (tab-bar--tab-bar-lines-for-frame frame))))
+      (unless (frame-parameter frame 'tab-bar-lines-keep-state)
+        (set-frame-parameter frame 'tab-bar-lines (tab-bar--tab-bar-lines-for-frame frame)))))
   (when (eq frames t)
     (setq default-frame-alist
           (cons (cons 'tab-bar-lines (if (and tab-bar-mode (eq tab-bar-show t)) 1 0))
@@ -233,7 +234,9 @@ new frame when the global `tab-bar-mode' is enabled, by using
   (add-hook 'after-make-frame-functions 'toggle-frame-tab-bar)"
   (interactive)
   (set-frame-parameter frame 'tab-bar-lines
-                       (if (> (frame-parameter frame 'tab-bar-lines) 0) 0 1)))
+                       (if (> (frame-parameter frame 'tab-bar-lines) 0) 0 1))
+  (set-frame-parameter frame 'tab-bar-lines-keep-state
+                       (not (frame-parameter frame 'tab-bar-lines-keep-state))))
 
 (defvar tab-bar-map (make-sparse-keymap)
   "Keymap for the tab bar.