aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2008-05-13 08:08:25 +0000
committerJan Djärv2008-05-13 08:08:25 +0000
commit44f249c0558f1dab796118fe4e95a31d320badac (patch)
tree0cfc0232d075b1862c3f5429bfca478f24b81e87 /src
parent3271a8f56cca6dc132ee3af157e87ab8faf42ab8 (diff)
downloademacs-44f249c0558f1dab796118fe4e95a31d320badac.tar.gz
emacs-44f249c0558f1dab796118fe4e95a31d320badac.zip
(handle_one_xevent): Don't pass buttons higher than 3
to Gtk+ menus.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 31bf04624b0..45104245d79 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-05-13 Jan Djärv <jan.h.d@swipnet.se>
2
3 * xterm.c (handle_one_xevent): Don't pass buttons higher than 3
4 to Gtk+ menus.
5
12008-05-13 Stefan Monnier <monnier@iro.umontreal.ca> 62008-05-13 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * dired.c (file_name_completion): Tweak the code so as to always do it 8 * dired.c (file_name_completion): Tweak the code so as to always do it
diff --git a/src/xterm.c b/src/xterm.c
index 5dda7ed2c5d..9d410a0ba8a 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7175,6 +7175,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
7175 if ( 7175 if (
7176#ifdef USE_GTK 7176#ifdef USE_GTK
7177 ! popup_activated () 7177 ! popup_activated ()
7178 /* Gtk+ menus only react to the first three buttons. */
7179 && event.xbutton.button < 3
7178 && 7180 &&
7179#endif 7181#endif
7180 f && event.type == ButtonPress 7182 f && event.type == ButtonPress