1 files changed, 9 insertions, 2 deletions

diff --git a/lisp/tab-line.el b/lisp/tab-line.el
index c98b1cfce61..d080da1867d 100644
--- a/lisp/tab-line.el
+++ b/lisp/tab-line.el
@@ -415,11 +415,10 @@ variable `tab-line-tabs-function'."
               next-buffers))))
 
 
-(defun tab-line-format ()
+(defun tab-line-format-template (tabs)
   "Template for displaying tab line for selected window."
   (let* ((window (selected-window))
          (selected-buffer (window-buffer window))
-         (tabs (funcall tab-line-tabs-function))
          (separator (or tab-line-separator (if window-system " " "|")))
          (hscroll (window-parameter nil 'tab-line-hscroll))
          (strings
@@ -470,6 +469,14 @@ variable `tab-line-tabs-function'."
        (list (concat separator (when tab-line-new-tab-choice
                                  tab-line-new-button)))))))
 
+(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)))))))
+
 
 (defcustom tab-line-auto-hscroll t
   "Allow or disallow automatic horizontal scrolling of the tab line.