master 655c8c2 3/5: Merge from origin/emacs-28

[Glenn Morris]

branch: master
commit 655c8c29d4839b4a9c42e3caf8bcd48380c54e91
Merge: 2708b48 47e09d1
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-28
    
    47e09d1855 Copy parent face attributes to tab-line-tab-current instea...
    d96f8b22c0 Another fix for 'ibuffer-shrink-to-fit' (Bug#7218, Bug#51029)
---
 lisp/ibuffer.el  | 4 ++--
 lisp/tab-line.el | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 046595a..e509545 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1079,8 +1079,8 @@ a new window in the current frame, splitting vertically."
   ;; Make sure that redisplay is performed, otherwise there can be a
   ;; bad interaction with code in the window-scroll-functions hook
   (redisplay t)
-  (when (and (boundp 'ibuffer-auto-mode) ; ibuf-ext.el might not be loaded yet
-             (buffer-local-value 'ibuffer-auto-mode (window-buffer)))
+  (when (with-current-buffer (window-buffer)
+          (eq major-mode 'ibuffer-mode))
     (fit-window-to-buffer
      nil (and owin
               (/ (frame-height)
diff --git a/lisp/tab-line.el b/lisp/tab-line.el
index 890d124..78c06bb 100644
--- a/lisp/tab-line.el
+++ b/lisp/tab-line.el
@@ -119,7 +119,11 @@ function `tab-line-tab-face-group'."
   :group 'tab-line-faces)
 
 (defface tab-line-highlight
-  '((t :inherit tab-line-tab))
+  '((((class color) (min-colors 88))
+     :box (:line-width 1 :style released-button)
+     :background "grey85"
+     :foreground "black")
+    (t :inverse-video nil))
   "Tab line face for highlighting."
   :version "27.1"
   :group 'tab-line-faces)