diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-22 09:00:14 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-22 09:00:14 +0400 |
| commit | b0358ef86903ac021110b54ee1acce11211c200f (patch) | |
| tree | a57eaedb410d4ba6d838fcf1fb188716f08a1eed /src/menu.c | |
| parent | 38852a76958ec456e01420ae2b26240d9f3bc63c (diff) | |
| download | emacs-b0358ef86903ac021110b54ee1acce11211c200f.tar.gz emacs-b0358ef86903ac021110b54ee1acce11211c200f.tar.bz2 emacs-b0358ef86903ac021110b54ee1acce11211c200f.zip | |
* xmenu.c (mouse_position_for_popup):
* xselect.c (mouse_position_for_drop): Do not duplicate ...
* xfns.c (x_relative_mouse_position): ... and prefer this function.
* menu.c (Fx_popup_menu):
* xselect.c (x_handle_dnd_message): Adjust users.
* menu.h (mouse_position_for_popup): Remove prototype.
* xterm.h (x_relative_mouse_position): Add prototype.
* xterm.c (x_find_topmost_parent): Break from the loop and do not
call XFree if XQueryTree returns zero.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/menu.c b/src/menu.c index 460dc7967b5..a523cfc6010 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1233,7 +1233,7 @@ no quit occurs and `x-popup-menu' returns nil. */) { int cur_x, cur_y; - mouse_position_for_popup (new_f, &cur_x, &cur_y); + x_relative_mouse_position (new_f, &cur_x, &cur_y); /* cur_x/y may be negative, so use make_number. */ x = make_number (cur_x); y = make_number (cur_y); |