master 0273cb5e6db: ; * src/pgtkfns.c (frame_geometry): Fix typo in last change.

[Po Lu]

branch: master
commit 0273cb5e6dbd6c5111f3352b7777b4efc769ba14
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    ; * src/pgtkfns.c (frame_geometry): Fix typo in last change.
---
 src/pgtkfns.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index 9cec7243515..c154d37f47f 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -3451,7 +3451,6 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute)
   tab_bar_height = FRAME_TAB_BAR_HEIGHT (f);
   tab_bar_width = (tab_bar_height
                   ? native_width - 2 * internal_border_width : 0);
-  inner_top += tab_bar_height;
 
   /* Construct list.  */
   if (EQ (attribute, Qouter_edges))
@@ -3464,10 +3463,12 @@ frame_geometry (Lisp_Object frame, Lisp_Object 
attribute)
   else if (EQ (attribute, Qinner_edges))
     return list4 (make_fixnum (native_left + internal_border_width),
                  make_fixnum (native_top
-                              + tool_bar_height
+                              + tab_bar_height
+                              + FRAME_TOOL_BAR_TOP_HEIGHT (f)
                               + internal_border_width),
                  make_fixnum (native_right - internal_border_width),
-                 make_fixnum (native_bottom - internal_border_width));
+                 make_fixnum (native_bottom - internal_border_width
+                              - FRAME_TOOL_BAR_BOTTOM_HEIGHT (f)));
   else
     return
       list (Fcons (Qouter_position,