--- rxvt-unicode/src/command.C	2007/11/12 14:53:13	1.364
+++ rxvt-unicode/src/command.C	2007/11/15 11:36:15	1.366
@@ -1253,13 +1253,14 @@
 
   x = Pixel2Col (ev.x);
   y = Pixel2Row (ev.y);
-  if (ev.type == MotionNotify) {
-    if (x == mouse_row && y == mouse_col)
-      return;
-    mouse_row = x;
-    mouse_col = y;
-    code += 32;
-  }
+  if (ev.type == MotionNotify)
+    {
+      if (x == mouse_row && y == mouse_col)
+        return;
+      mouse_row = x;
+      mouse_col = y;
+      code += 32;
+    }
 
   if (MEvent.button == AnyButton)
     button_number = 3;
@@ -1851,7 +1852,7 @@
 #else
           MEvent.button = ev.button;
           mouse_report (ev);
-#endif				/* MOUSE_REPORT_DOUBLECLICK */
+#endif /* MOUSE_REPORT_DOUBLECLICK */
 
         }
       else
@@ -1955,7 +1956,7 @@
               }
         }
       else
-#endif				/* NO_SCROLLBAR_REPORT */
+#endif /* NO_SCROLLBAR_REPORT */
 
         {
           char            upordown = 0;
@@ -2102,7 +2103,7 @@
 #else				/* MOUSE_REPORT_DOUBLECLICK */
           MEvent.button = AnyButton;
           mouse_report (ev);
-#endif				/* MOUSE_REPORT_DOUBLECLICK */
+#endif /* MOUSE_REPORT_DOUBLECLICK */
           return;
         }
 
@@ -2449,7 +2450,7 @@
 
   pclose_printer (fd);
 }
-#endif				/* PRINTPIPE */
+#endif /* PRINTPIPE */
 /*}}} */
 
 /* *INDENT-OFF* */
@@ -3699,11 +3700,13 @@
 #endif
             case 1002:
             case 1003:
-              if (state) {
-                priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
-                priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
-                vt_emask_mouse = PointerMotionMask;
-              } else
+              if (state)
+                {
+                  priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
+                  priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
+                  vt_emask_mouse = PointerMotionMask;
+                }
+              else
                 vt_emask_mouse = NoEventMask;
               vt_select_input ();
               break;