[Emacs-diffs] trunk r117856: * xterm.c (handle_one_xevent): Add braces to pacify gcc -Wall.

[Paul Eggert]

------------------------------------------------------------
revno: 117856
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-09-10 10:18:38 -0700
message:
  * xterm.c (handle_one_xevent): Add braces to pacify gcc -Wall.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-10 17:02:42 +0000
+++ b/src/ChangeLog     2014-09-10 17:18:38 +0000
@@ -1,3 +1,7 @@
+2014-09-10  Paul Eggert  <address@hidden>
+
+       * xterm.c (handle_one_xevent): Add braces to pacify gcc -Wall.
+
 2014-09-10  Jan Djärv  <address@hidden>
 
        * xterm.c (handle_one_xevent): Detect iconified by looking at

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-09-10 17:02:42 +0000
+++ b/src/xterm.c       2014-09-10 17:18:38 +0000
@@ -6846,28 +6846,30 @@
       dpyinfo->last_user_time = event->xproperty.time;
       f = x_top_window_to_frame (dpyinfo, event->xproperty.window);
       if (f && event->xproperty.atom == dpyinfo->Xatom_net_wm_state)
-        if (x_handle_net_wm_state (f, &event->xproperty)
-           && FRAME_ICONIFIED_P (f)
-           && f->output_data.x->net_wm_state_hidden_seen)
-          {
-            /* Gnome shell does not iconify us when C-z is pressed.
-              It hides the frame.  So if our state says we aren't
-              hidden anymore, treat it as deiconified.  */
-            SET_FRAME_VISIBLE (f, 1);
-            SET_FRAME_ICONIFIED (f, 0);
-            f->output_data.x->has_been_visible = 1;
-            f->output_data.x->net_wm_state_hidden_seen = 0;
-            inev.ie.kind = DEICONIFY_EVENT;
-            XSETFRAME (inev.ie.frame_or_window, f);
-          }
-        else if (! FRAME_ICONIFIED_P (f)
-                 && f->output_data.x->net_wm_state_hidden_seen)
-          {
-            SET_FRAME_VISIBLE (f, 0);
-            SET_FRAME_ICONIFIED (f, 1);
-            inev.ie.kind = ICONIFY_EVENT;
-            XSETFRAME (inev.ie.frame_or_window, f);
-          }
+       {
+         if (x_handle_net_wm_state (f, &event->xproperty)
+             && FRAME_ICONIFIED_P (f)
+             && f->output_data.x->net_wm_state_hidden_seen)
+           {
+             /* Gnome shell does not iconify us when C-z is pressed.
+                It hides the frame.  So if our state says we aren't
+                hidden anymore, treat it as deiconified.  */
+             SET_FRAME_VISIBLE (f, 1);
+             SET_FRAME_ICONIFIED (f, 0);
+             f->output_data.x->has_been_visible = 1;
+             f->output_data.x->net_wm_state_hidden_seen = 0;
+             inev.ie.kind = DEICONIFY_EVENT;
+             XSETFRAME (inev.ie.frame_or_window, f);
+           }
+         else if (! FRAME_ICONIFIED_P (f)
+                  && f->output_data.x->net_wm_state_hidden_seen)
+           {
+             SET_FRAME_VISIBLE (f, 0);
+             SET_FRAME_ICONIFIED (f, 1);
+             inev.ie.kind = ICONIFY_EVENT;
+             XSETFRAME (inev.ie.frame_or_window, f);
+           }
+       }
 
       x_handle_property_notify (&event->xproperty);
       xft_settings_event (dpyinfo, event);