diff options
| author | Po Lu | 2022-02-12 10:33:14 +0800 |
|---|---|---|
| committer | Po Lu | 2022-02-12 10:33:14 +0800 |
| commit | 9de7b3f3355cec3b36dd16af66d0110240bebfb8 (patch) | |
| tree | 33ed2c7e0a70ad432e56f49b209f4af6a03fdeca /src | |
| parent | 7c37f5fd698227f1d0f1ebb40b004bc021028cae (diff) | |
| download | emacs-9de7b3f3355cec3b36dd16af66d0110240bebfb8.tar.gz emacs-9de7b3f3355cec3b36dd16af66d0110240bebfb8.zip | |
Fix compatibility with ancient versions of libXi
* src/xmenu.c (popup_get_selection): Don't rely on xev->display
being non-NULL.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmenu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 745a80ade1b..eaec6efc26c 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -318,7 +318,7 @@ popup_get_selection (XEvent *initial_event, struct x_display_info *dpyinfo, | |||
| 318 | copy.xbutton.type = ButtonRelease; | 318 | copy.xbutton.type = ButtonRelease; |
| 319 | copy.xbutton.serial = xev->serial; | 319 | copy.xbutton.serial = xev->serial; |
| 320 | copy.xbutton.send_event = xev->send_event; | 320 | copy.xbutton.send_event = xev->send_event; |
| 321 | copy.xbutton.display = xev->display; | 321 | copy.xbutton.display = dpyinfo->display; |
| 322 | copy.xbutton.window = xev->event; | 322 | copy.xbutton.window = xev->event; |
| 323 | copy.xbutton.root = xev->root; | 323 | copy.xbutton.root = xev->root; |
| 324 | copy.xbutton.subwindow = xev->child; | 324 | copy.xbutton.subwindow = xev->child; |
| @@ -363,7 +363,7 @@ popup_get_selection (XEvent *initial_event, struct x_display_info *dpyinfo, | |||
| 363 | copy.xkey.type = KeyPress; | 363 | copy.xkey.type = KeyPress; |
| 364 | copy.xkey.serial = xev->serial; | 364 | copy.xkey.serial = xev->serial; |
| 365 | copy.xkey.send_event = xev->send_event; | 365 | copy.xkey.send_event = xev->send_event; |
| 366 | copy.xkey.display = xev->display; | 366 | copy.xkey.display = dpyinfo->display; |
| 367 | copy.xkey.window = xev->event; | 367 | copy.xkey.window = xev->event; |
| 368 | copy.xkey.root = xev->root; | 368 | copy.xkey.root = xev->root; |
| 369 | copy.xkey.subwindow = xev->child; | 369 | copy.xkey.subwindow = xev->child; |