diff options
| author | Dmitry Antipov | 2013-09-17 19:57:45 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-09-17 19:57:45 +0400 |
| commit | 0791d107eddb1ff08b321b204427fd3599e0b2cb (patch) | |
| tree | 5e7288b7b290f47887634e36fdcaba4b8ed412dc /src/xterm.c | |
| parent | 96dbf5a8ae33d9523212357bcead7b5fa2473697 (diff) | |
| download | emacs-0791d107eddb1ff08b321b204427fd3599e0b2cb.tar.gz emacs-0791d107eddb1ff08b321b204427fd3599e0b2cb.zip | |
* w32term.c (w32_read_socket): Avoid temporary
variables in a call to x_real_positions.
* xterm.c (handle_one_xevent): Likewise.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/xterm.c b/src/xterm.c index fadcdbfea98..08a360fd52c 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6129,11 +6129,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 6129 | f = x_top_window_to_frame (dpyinfo, event->xreparent.window); | 6129 | f = x_top_window_to_frame (dpyinfo, event->xreparent.window); |
| 6130 | if (f) | 6130 | if (f) |
| 6131 | { | 6131 | { |
| 6132 | int x, y; | ||
| 6133 | f->output_data.x->parent_desc = event->xreparent.parent; | 6132 | f->output_data.x->parent_desc = event->xreparent.parent; |
| 6134 | x_real_positions (f, &x, &y); | 6133 | x_real_positions (f, &f->left_pos, &f->top_pos); |
| 6135 | f->left_pos = x; | ||
| 6136 | f->top_pos = y; | ||
| 6137 | 6134 | ||
| 6138 | /* Perhaps reparented due to a WM restart. Reset this. */ | 6135 | /* Perhaps reparented due to a WM restart. Reset this. */ |
| 6139 | FRAME_DISPLAY_INFO (f)->wm_type = X_WMTYPE_UNKNOWN; | 6136 | FRAME_DISPLAY_INFO (f)->wm_type = X_WMTYPE_UNKNOWN; |
| @@ -6827,9 +6824,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 6827 | if (FRAME_GTK_OUTER_WIDGET (f) | 6824 | if (FRAME_GTK_OUTER_WIDGET (f) |
| 6828 | && gtk_widget_get_mapped (FRAME_GTK_OUTER_WIDGET (f))) | 6825 | && gtk_widget_get_mapped (FRAME_GTK_OUTER_WIDGET (f))) |
| 6829 | #endif | 6826 | #endif |
| 6830 | { | 6827 | x_real_positions (f, &f->left_pos, &f->top_pos); |
| 6831 | x_real_positions (f, &f->left_pos, &f->top_pos); | ||
| 6832 | } | ||
| 6833 | 6828 | ||
| 6834 | #ifdef HAVE_X_I18N | 6829 | #ifdef HAVE_X_I18N |
| 6835 | if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMStatusArea)) | 6830 | if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMStatusArea)) |