Better fix for ignoring 'tab-bar-lines' in daemon's initial frame

* lisp/tab-bar.el (tab-bar--update-tab-bar-lines):
Revert '(not (daemonp))' to update 'default-frame-alist'
even in daemon mode (bug#78896).

* lisp/frame.el (frame-notice-user-settings): For daemon's
initial frame don't modify the frame parameter 'tab-bar-lines'.

(cherry picked from commit b13c583bc7303780b22e7bf4c4fb832fadfc36a7)

diff --git a/lisp/frame.el b/lisp/frame.el
index e0ab3c7dee38e701e55cc7b549f0523cee0bb86e..5f8fd53290ffc4ebd49fdf856d7d1358ad89ba48 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -490,8 +490,12 @@ there (in decreasing order of priority)."
             parms
           ;; initial-frame-alist and default-frame-alist were already
           ;; applied in pc-win.el.
-          (append initial-frame-alist window-system-frame-alist
-                  default-frame-alist parms nil)))
+          (setq parms (append initial-frame-alist window-system-frame-alist
+                              default-frame-alist parms nil))
+          ;; Don't enable tab-bar in daemon's initial frame.
+          (when (and (daemonp) (not (frame-parameter nil 'client)))
+            (setq parms (delq (assq 'tab-bar-lines parms) parms)))
+          parms))
        (if (null initial-window-system) ;; MS-DOS does this differently in pc-win.el
            (let ((newparms (frame-parameters))
                  (frame (selected-frame)))

diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index ffd67deaf0185efa452247b1c674659b861c39d4..b498e9d1b08fc657f6f4a4bfb62a9d3996b7dd2d 100644 (file)
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -286,7 +286,7 @@ a list of frames to update."
         (set-frame-parameter frame 'tab-bar-lines
                              (tab-bar--tab-bar-lines-for-frame frame)))))
   ;; Update `default-frame-alist'
-  (when (and (eq frames t) (not (daemonp)))
+  (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))