From fa939a20ad4752bdf6d591b09ec69e14981aa714 Mon Sep 17 00:00:00 2001 From: Joseph Turner Date: Mon, 15 Jul 2024 22:07:22 -0700 Subject: [PATCH 4/4] Remove obsolete tab-bar-auto-width-faces * lisp/tab-bar.el (tab-bar-auto-width-faces): Remove. (tab-bar-auto-width): Only run tab-bar-auto-width-functions. --- lisp/tab-bar.el | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index 853f487743d..57ea78414bc 100644 --- a/lisp/tab-bar.el +++ b/lisp/tab-bar.el @@ -1216,13 +1216,6 @@ tab-bar-auto-width-min It's not recommended to change this value since with larger values, the tab bar might wrap to the second line when it shouldn't.") -(make-obsolete-variable 'tab-bar-auto-width-faces 'tab-bar-auto-width-functions "30") -(defvar tab-bar-auto-width-faces - '( tab-bar-tab tab-bar-tab-inactive - tab-bar-tab-ungrouped - tab-bar-tab-group-inactive) - "Resize tabs only with these faces.") - (defun tab-bar-auto-width-predicate-default (item) "Accepts tab ITEM and returns non-nil for tabs and tab groups." (string-match-p @@ -1263,10 +1256,7 @@ tab-bar-auto-width (width 0)) ;; resize tab names to this width (dolist (item items) (when (and (eq (nth 1 item) 'menu-item) (stringp (nth 2 item))) - (if (if (version<= "31" emacs-version) - (run-hook-with-args-until-success 'tab-bar-auto-width-functions item) - (memq (get-text-property 0 'face (nth 2 item)) - tab-bar-auto-width-faces)) + (if (run-hook-with-args-until-success 'tab-bar-auto-width-functions item) (push item tabs) (unless (eq (nth 0 item) 'align-right) (setq non-tabs (concat non-tabs (nth 2 item))))))) -- 2.41.0