Fix two small tab bar issues

* lisp/cus-start.el (frame-inhibit-implied-resize): Update version tag.
* lisp/frame.el (frame-inner-height): Do not count in tab bar.

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 4b7c3863063e790b7a3a3f59a818e5b7bcd17dc2..b7f0d7e2a8597393bc66d7e989380b3b8b5a14c8 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -336,7 +336,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                            (const :tag "Never" nil)
                                            (const :tag "Always" t)
                                            (repeat (symbol :tag "Parameter")))
-                                          "25.1")
+                                          "27.1")
             (iconify-child-frame frames
                                  (choice
                                   (const :tag "Do nothing" nil)

diff --git a/lisp/frame.el b/lisp/frame.el
index 7f1b8af9190054b43203d9260f9363e5566fa44c..15e46c9e210067bed9dc1e82c165fbddf23a8287 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1344,6 +1344,7 @@ FRAME defaults to the selected frame."
 FRAME defaults to the selected frame."
   (setq frame (window-normalize-frame frame))
   (- (frame-native-height frame)
+     (tab-bar-height frame t)
      (* 2 (frame-internal-border-width frame))))
 
 (defun frame-outer-width (&optional frame)