diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-09 11:42:31 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-09 11:42:31 -0700 |
| commit | 762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a (patch) | |
| tree | 7b2fe40a89bf327ea8b9ad8265a6b6f27cacd2a7 /src/xterm.c | |
| parent | eb3f1cc8dfe6a96505f1c5f9174b2712998cb52f (diff) | |
| parent | 8546720e6f25eb988e8215de6678798053031440 (diff) | |
| download | emacs-762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a.tar.gz | |
Merge from mainline.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c index 3fc431c1350..b3e33b7c0bb 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -4045,7 +4045,7 @@ x_window_to_scroll_bar (Display *display, Window window_id) return XSCROLL_BAR (bar); } - return 0; + return NULL; } @@ -6008,7 +6008,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, goto OTHER; #endif /* USE_X_TOOLKIT */ { - XSelectionClearEvent *eventp = (XSelectionClearEvent *) &event; + XSelectionClearEvent *eventp = &(event.xselectionclear); inev.ie.kind = SELECTION_CLEAR_EVENT; SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display; @@ -6025,8 +6025,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, goto OTHER; #endif /* USE_X_TOOLKIT */ { - XSelectionRequestEvent *eventp - = (XSelectionRequestEvent *) &event; + XSelectionRequestEvent *eventp = &(event.xselectionrequest); inev.ie.kind = SELECTION_REQUEST_EVENT; SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display; |