From: Martin Rudalics <rudalics@gmx.at>
Date: Sat, 6 Feb 2021 08:28:40 +0000 (+0100)
Subject: Fix two small tab bar issues
X-Git-Tag: emacs-27.2-rc1~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c5ddf0e0b;p=emacs.git

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 4b7c3863063..b7f0d7e2a85 100644
--- 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 7f1b8af9190..15e46c9e210 100644
--- 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)