martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(Fx_popup_menu, Fx_popup_dialog): Check for tool-bar

Browse Source 
position like menu-bar.
This commit is contained in:
Dave Love
2000-10-05 21:18:30 +00:00
parent 1391c56767
commit 2b06561ab5
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@@ -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.

8
src/xmenu.c
View File

@@ -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. */