mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-15 17:00:26 +00:00
Code Issues Releases Activity

* lisp/tab-line.el (tab-line-format): Use composite cache key (bug#38522)

Browse Source
This commit is contained in:
Juri Linkov 2019-12-09 00:08:53 +02:00
parent 37d801a19a
commit fe7ae74c0b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/tab-line.el
View File

@ -417,8 +417,7 @@ variable `tab-line-tabs-function'."
(defun tab-line-format-template (tabs)
"Template for displaying tab line for selected window."
(let* ((window (selected-window))
(selected-buffer (window-buffer window))
(let* ((selected-buffer (window-buffer))
(separator (or tab-line-separator (if window-system " " "|")))
(hscroll (window-parameter nil 'tab-line-hscroll))
(strings
@ -471,11 +470,15 @@ variable `tab-line-tabs-function'."
(defun tab-line-format ()
"Template for displaying tab line for selected window."
(let ((tabs (funcall tab-line-tabs-function))
(cache (window-parameter nil 'tab-line-cache)))
(or (and cache (equal (car cache) tabs) (cdr cache))
(cdr (set-window-parameter nil 'tab-line-cache
(cons tabs (tab-line-format-template tabs)))))))
(let* ((tabs (funcall tab-line-tabs-function))
(cache-key (list tabs
(window-buffer)
(window-parameter nil 'tab-line-hscroll)))
(cache (window-parameter nil 'tab-line-cache)))
(or (and cache (equal (car cache) cache-key) (cdr cache))
(cdr (set-window-parameter
nil 'tab-line-cache
(cons cache-key (tab-line-format-template tabs)))))))
(defcustom tab-line-auto-hscroll t