masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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'.
This commit is contained in:
Juri Linkov 2025-06-29 20:06:06 +03:00
parent 7fd846f61e
commit b13c583bc7
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/frame.el
View file

@ -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)))

2
lisp/tab-bar.el
View file

@ -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))