procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the function 'window-system' on the tab-bar/tab-line (bug#59620)

Browse source 
* lisp/tab-bar.el (tab-bar-separator)
(tab-bar-format-align-right, tab-bar-auto-width):
* lisp/tab-line.el (tab-line-format-template): Replace the variable
'window-system' with the function call '(window-system)'.
This commit is contained in:
Juri Linkov 2022-12-04 21:30:34 +02:00
parent 432b9655ae
commit a27f61f6f4
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/tab-bar.el
View file

@ -586,7 +586,7 @@ and `tab-bar-select-tab-modifiers'."
(defun tab-bar-separator () (defun tab-bar-separator ()
"Separator between tabs." "Separator between tabs."
(or tab-bar-separator (if window-system " " "|"))) (or tab-bar-separator (if (window-system) " " "|")))
(defcustom tab-bar-tab-name-function #'tab-bar-tab-name-current (defcustom tab-bar-tab-name-function #'tab-bar-tab-name-current
@ -939,7 +939,7 @@ when the tab is current. Return the result as a keymap."
(str (propertize " " 'display (str (propertize " " 'display
;; The `right' spec doesn't work on TTY frames ;; The `right' spec doesn't work on TTY frames
;; when windows are split horizontally (bug#59620) ;; when windows are split horizontally (bug#59620)
(if window-system (if (window-system)
`(space :align-to (- right (,hpos))) `(space :align-to (- right (,hpos)))
`(space :align-to (,(- (frame-inner-width) hpos))))))) `(space :align-to (,(- (frame-inner-width) hpos)))))))
`((align-right menu-item ,str ignore)))) `((align-right menu-item ,str ignore))))
@ -1060,11 +1060,11 @@ tab bar might wrap to the second line when it shouldn't.")
(string-pixel-width non-tabs)) (string-pixel-width non-tabs))
(length tabs))) (length tabs)))
(when tab-bar-auto-width-min (when tab-bar-auto-width-min
(setq width (max width (if window-system (setq width (max width (if (window-system)
(nth 0 tab-bar-auto-width-min) (nth 0 tab-bar-auto-width-min)
(nth 1 tab-bar-auto-width-min))))) (nth 1 tab-bar-auto-width-min)))))
(when tab-bar-auto-width-max (when tab-bar-auto-width-max
(setq width (min width (if window-system (setq width (min width (if (window-system)
(nth 0 tab-bar-auto-width-max) (nth 0 tab-bar-auto-width-max)
(nth 1 tab-bar-auto-width-max))))) (nth 1 tab-bar-auto-width-max)))))
(dolist (item tabs) (dolist (item tabs)

2
lisp/tab-line.el
View file

@ -504,7 +504,7 @@ which the tab will represent."
(defun tab-line-format-template (tabs) (defun tab-line-format-template (tabs)
"Template of the format for displaying tab line for selected window. "Template of the format for displaying tab line for selected window.
This is used by `tab-line-format'." This is used by `tab-line-format'."
(let* ((separator (or tab-line-separator (if window-system " " "|"))) (let* ((separator (or tab-line-separator (if (window-system) " " "|")))
(hscroll (window-parameter nil 'tab-line-hscroll)) (hscroll (window-parameter nil 'tab-line-hscroll))
(strings (strings
(mapcar (mapcar