Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cache only the last string in 'tab-bar-format-align-right' (bug#78953)

Browse source 
* lisp/tab-bar.el (tab-bar--align-right-cache):
Rename from 'tab-bar--align-right-hash'.
(tab-bar-format-align-right): Use it to store
the string in the car, and the width in the cdr.
This commit is contained in:
Juri Linkov 2025-07-10 09:40:51 +03:00
parent b85d9048f4
commit 99080d0c04
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/tab-bar.el
View file

@ -1194,8 +1194,8 @@ when the tab is current. Return the result as a keymap."
`((add-tab menu-item ,tab-bar-new-button tab-bar-new-tab
:help "New tab"))))
(defvar tab-bar--align-right-hash nil
"Memoization table for `tab-bar-format-align-right'.")
(defvar tab-bar--align-right-cache nil
"Optimization for `tab-bar-format-align-right'.")
(defun tab-bar-format-align-right (&optional rest)
"Align the rest of tab bar items to the right.
@ -1203,20 +1203,19 @@ The argument `rest' is used for special handling of this item
by `tab-bar-format-list' that collects the rest of formatted items.
This prevents calling other non-idempotent items like
`tab-bar-format-global' twice."
(unless tab-bar--align-right-hash
(define-hash-table-test 'tab-bar--align-right-hash-test
#'equal-including-properties
#'sxhash-equal-including-properties)
(setq tab-bar--align-right-hash
(make-hash-table :test 'tab-bar--align-right-hash-test)))
(let* ((rest (or rest (tab-bar-format-list
(cdr (memq 'tab-bar-format-align-right
tab-bar-format)))))
(rest (mapconcat (lambda (item) (nth 2 item)) rest ""))
(hpos (progn
(add-face-text-property 0 (length rest) 'tab-bar t rest)
(with-memoization (gethash rest tab-bar--align-right-hash)
(string-pixel-width rest))))
(or (and tab-bar--align-right-cache
(equal-including-properties
(car tab-bar--align-right-cache) rest)
(cdr tab-bar--align-right-cache))
(let ((width (string-pixel-width rest)))
(setq tab-bar--align-right-cache (cons rest width))
width))))
(str (propertize " " 'display
;; The `right' spec doesn't work on TTY frames
;; when windows are split horizontally (bug#59620)