From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 19 May 1994 05:56:21 +0000 (+0000)
Subject: (xmenu_show): Don't look in menubar for core.height if no menu bar.
X-Git-Tag: emacs-19.34~8301
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f70e9e1e64e5e48823bc4a1ba585e0a615ef28bc;p=emacs.git

(xmenu_show): Don't look in menubar for core.height if no menu bar.
---

diff --git a/src/xmenu.c b/src/xmenu.c
index 2cb5974b4e5..a30c4ac29df 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1427,9 +1427,10 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
     menubarp = 0;
 
   /* Offset the coordinates to root-relative.  */
+  if (f->display.x->menubar_widget != 0)
+    y += f->display.x->menubar_widget->core.height;
   XtTranslateCoords (f->display.x->widget,
-		     x, y + f->display.x->menubar_widget->core.height,
-		     &root_x, &root_y);
+		     x, y, &root_x, &root_y);
   x = root_x;
   y = root_y;