From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 6 Mar 2000 12:11:01 +0000 (+0000)
Subject: (x_set_menu_bar_lines_1): Adjust window's orig_top and
X-Git-Tag: emacs-pretest-21.0.90~4755
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4336c70520accb670fa8dc472d04f0efaae9a77c;p=emacs.git

(x_set_menu_bar_lines_1): Adjust window's orig_top and
orig_height if set.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b97ad5ef07e..bdc8e9207f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2000-03-06  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfns.c (x_set_menu_bar_lines_1): Adjust window's orig_top and
+	orig_height if set.
+
+	* frame.c (set_menu_bar_lines_1): Adjust window's orig_top and
+	orig_height if set.
+
 2000-03-06  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* msdos.c (IT_note_mouse_highlight): Return immediately if frame's
@@ -20,7 +28,7 @@
 	FRAME_INTERNAL_BORDER_WIDTH.
 
 	* xdisp.c (try_window_id): Recompute unchanged information if
-	it is invalid.
+	it is obviously invalid.
 
 	* xterm.c (x_term_init): Create a colormap if not using the
 	default visual.
diff --git a/src/frame.c b/src/frame.c
index eb0f752fc06..f5cc8bf1d32 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -174,6 +174,11 @@ set_menu_bar_lines_1 (window, n)
   XSETFASTINT (w->last_modified, 0);
   XSETFASTINT (w->top, XFASTINT (w->top) + n);
   XSETFASTINT (w->height, XFASTINT (w->height) - n);
+  
+  if (INTEGERP (w->orig_top))
+    XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n);
+  if (INTEGERP (w->orig_height))
+    XSETFASTINT (w->orig_height, XFASTINT (w->orig_height) - n);
 
   /* Handle just the top child in a vertical split.  */
   if (!NILP (w->vchild))
diff --git a/src/xfns.c b/src/xfns.c
index bf241d0b4d5..dafee872a34 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1915,6 +1915,11 @@ x_set_menu_bar_lines_1 (window, n)
   XSETFASTINT (w->top, XFASTINT (w->top) + n);
   XSETFASTINT (w->height, XFASTINT (w->height) - n);
 
+  if (INTEGERP (w->orig_top))
+    XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n);
+  if (INTEGERP (w->orig_height))
+    XSETFASTINT (w->orig_height, XFASTINT (w->orig_height) - n);
+
   /* Handle just the top child in a vertical split.  */
   if (!NILP (w->vchild))
     x_set_menu_bar_lines_1 (w->vchild, n);