(Fx_popup_menu, Fx_popup_dialog): Check for tool-bar

position like menu-bar.

diff --git a/src/ChangeLog b/src/ChangeLog
index d18eacce33d8723beca4dc2da2ac8b7cb2b394d7..89735cbfdb3574bd37d2945769c61ed519d8af7c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-05  Dave Love  <fx@gnu.org>
+
+       * xmenu.c (Fx_popup_menu, Fx_popup_dialog): Check for tool-bar
+       position like menu-bar.
+
 2000-10-05  Gerd Moellmann  <gerd@gnu.org>
 
        * keyboard.c (Frecursive_edit): Make sure redisplay can happen.

diff --git a/src/xmenu.c b/src/xmenu.c
index fa7c352cc88558911fdaa21b0f4067c1259830ba..db20b6b0b61b64bea976592d9baed6f030951cf9 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,5 +1,5 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1986, 88, 93, 94, 96, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1986, 88, 93, 94, 96, 99, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -708,7 +708,8 @@ cached information about equivalent key sequences.")
 
       /* Decode the first argument: find the window and the coordinates.  */
       if (EQ (position, Qt)
-         || (CONSP (position) && EQ (XCAR (position), Qmenu_bar)))
+         || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
+                                  || EQ (XCAR (position), Qtool_bar))))
        {
          /* Use the mouse's current position.  */
          FRAME_PTR new_f = SELECTED_FRAME ();
@@ -906,7 +907,8 @@ on the left of the dialog box and all following items on the right.\n\
 
   /* Decode the first argument: find the window or frame to use.  */
   if (EQ (position, Qt)
-      || (CONSP (position) && EQ (XCAR (position), Qmenu_bar)))
+      || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
+                              || EQ (XCAR (position), Qtool_bar))))
     {
 #if 0 /* Using the frame the mouse is on may not be right.  */
       /* Use the mouse's current position.  */