[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114333: * w32term.c (w32_read_socket): Avoid tempor
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r114333: * w32term.c (w32_read_socket): Avoid temporary |
Date: |
Tue, 17 Sep 2013 15:58:21 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114333
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 19:57:45 +0400
message:
* w32term.c (w32_read_socket): Avoid temporary
variables in a call to x_real_positions.
* xterm.c (handle_one_xevent): Likewise.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w32term.c w32term.c-20091113204419-o5vbwnq5f7feedwu-950
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-09-17 12:59:45 +0000
+++ b/src/ChangeLog 2013-09-17 15:57:45 +0000
@@ -1,5 +1,11 @@
2013-09-17 Dmitry Antipov <address@hidden>
+ * w32term.c (w32_read_socket): Avoid temporary
+ variables in a call to x_real_positions.
+ * xterm.c (handle_one_xevent): Likewise.
+
+2013-09-17 Dmitry Antipov <address@hidden>
+
* frame.h (x_set_bitmap_icon) [!HAVE_NS]: New function.
(x_icon_type): Remove prototype.
(x_bitmap_icon) [!HAVE_NS]: Declare as such.
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2013-09-17 12:59:45 +0000
+++ b/src/w32term.c 2013-09-17 15:57:45 +0000
@@ -4687,13 +4687,7 @@
f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
if (f && !FRAME_ICONIFIED_P (f))
- {
- int x, y;
-
- x_real_positions (f, &x, &y);
- f->left_pos = x;
- f->top_pos = y;
- }
+ x_real_positions (f, &f->left_pos, &f->top_pos);
check_visibility = 1;
break;
@@ -4756,16 +4750,12 @@
if (iconified)
{
- int x, y;
-
/* Reset top and left positions of the Window
here since Windows sends a WM_MOVE message
BEFORE telling us the Window is minimized
when the Window is iconified, with 3000,3000
as the co-ords. */
- x_real_positions (f, &x, &y);
- f->left_pos = x;
- f->top_pos = y;
+ x_real_positions (f, &f->left_pos, &f->top_pos);
inev.kind = DEICONIFY_EVENT;
XSETFRAME (inev.frame_or_window, f);
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2013-09-17 12:59:45 +0000
+++ b/src/xterm.c 2013-09-17 15:57:45 +0000
@@ -6129,11 +6129,8 @@
f = x_top_window_to_frame (dpyinfo, event->xreparent.window);
if (f)
{
- int x, y;
f->output_data.x->parent_desc = event->xreparent.parent;
- x_real_positions (f, &x, &y);
- f->left_pos = x;
- f->top_pos = y;
+ x_real_positions (f, &f->left_pos, &f->top_pos);
/* Perhaps reparented due to a WM restart. Reset this. */
FRAME_DISPLAY_INFO (f)->wm_type = X_WMTYPE_UNKNOWN;
@@ -6827,9 +6824,7 @@
if (FRAME_GTK_OUTER_WIDGET (f)
&& gtk_widget_get_mapped (FRAME_GTK_OUTER_WIDGET (f)))
#endif
- {
- x_real_positions (f, &f->left_pos, &f->top_pos);
- }
+ x_real_positions (f, &f->left_pos, &f->top_pos);
#ifdef HAVE_X_I18N
if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMStatusArea))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114333: * w32term.c (w32_read_socket): Avoid temporary,
Dmitry Antipov <=