summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/cus-start.el2
-rw-r--r--lisp/frame.el1
2 files changed, 2 insertions, 1 deletions
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)