From: Dave Love Date: Thu, 5 Oct 2000 21:18:30 +0000 (+0000) Subject: (Fx_popup_menu, Fx_popup_dialog): Check for tool-bar X-Git-Tag: emacs-pretest-21.0.90~1131 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b06561ab5054b2b36b74dfcf1c3bf38bc1090ff;p=emacs.git (Fx_popup_menu, Fx_popup_dialog): Check for tool-bar position like menu-bar. --- diff --git a/src/ChangeLog b/src/ChangeLog index d18eacce33d..89735cbfdb3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2000-10-05 Dave Love + + * xmenu.c (Fx_popup_menu, Fx_popup_dialog): Check for tool-bar + position like menu-bar. + 2000-10-05 Gerd Moellmann * keyboard.c (Frecursive_edit): Make sure redisplay can happen. diff --git a/src/xmenu.c b/src/xmenu.c index fa7c352cc88..db20b6b0b61 100644 --- 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. */