6 files changed, 11 insertions, 19 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 231d9771e15..c6eb58071e8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2013-09-09  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        Do not populate pure Xism x_sync to other ports.
+        * frame.h (x_sync): Move under HAVE_X_WINDOWS.
+        * frame.c (other_visible_frames) [HAVE_X_WINDOWS]: Use as such.
+        * nsfns.m, w32xfns.c (x_sync): Remove no-op.
+        * w32term.h (x_sync): Remove prototype.
+
+2013-09-09  Dmitry Antipov  <dmantipov@yandex.ru>
+
         Cleanup frame flushing.
         * dispextern.h (struct redisplay_interface): Drop
         flush_display_optional because flush_display is enough
diff --git a/src/frame.c b/src/frame.c
index 0f1560df157..692d224866c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1108,7 +1108,7 @@ other_visible_frames (struct frame *f)
 
       /* Verify that we can still talk to the frame's X window,
          and note any recent change in visibility.  */
-#ifdef HAVE_WINDOW_SYSTEM
+#ifdef HAVE_X_WINDOWS
       if (FRAME_WINDOW_P (XFRAME (this)))
         x_sync (XFRAME (this));
 #endif
diff --git a/src/frame.h b/src/frame.h
index 3d9457ce4d7..baf8d6b93a9 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1243,7 +1243,6 @@ extern Lisp_Object display_x_get_resource (Display_Info *,
 extern void set_frame_menubar (struct frame *f, bool first_time, bool deep_p);
 extern void x_set_window_size (struct frame *f, int change_grav,
                               int cols, int rows);
-extern void x_sync (struct frame *);
 extern Lisp_Object x_get_focus_frame (struct frame *);
 extern void x_set_mouse_position (struct frame *f, int h, int v);
 extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y);
@@ -1269,7 +1268,8 @@ extern void x_wm_set_icon_position (struct frame *, int, int);
 #if !defined USE_X_TOOLKIT
 extern char *x_get_resource_string (const char *, const char *);
 #endif
-#endif
+extern void x_sync (struct frame *);
+#endif /* HAVE_X_WINDOWS */
 
 extern void x_query_colors (struct frame *f, XColor *, int);
 extern void x_query_color (struct frame *f, XColor *);
diff --git a/src/nsfns.m b/src/nsfns.m
index fc276c2b12d..f021e834d59 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2231,15 +2231,6 @@ x_get_focus_frame (struct frame *frame)
   return nsfocus;
 }
 
-void
-x_sync (struct frame *f)
-{
-  /* XXX Not implemented XXX */
-  return;
-}
-
-
-
 /* ==========================================================================
 
     Lisp definitions that, for whatever reason, we can't alias as 'ns-XXX'.
diff --git a/src/w32term.h b/src/w32term.h
index 41c5c71832a..b4818f69aee 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -211,7 +211,6 @@ extern void x_set_window_size (struct frame *f, int change_grav,
                               int cols, int rows);
 extern int x_display_pixel_height (struct w32_display_info *);
 extern int x_display_pixel_width (struct w32_display_info *);
-extern void x_sync (struct frame *);
 extern Lisp_Object x_get_focus_frame (struct frame *);
 extern void x_set_mouse_position (struct frame *f, int h, int v);
 extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y);
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 19c6b72bf89..7629e49caf8 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -333,9 +333,3 @@ drain_message_queue (void)
     }
   return retval;
 }
-
-/* x_sync is a no-op on W32.  */
-void
-x_sync (struct frame *f)
-{
-}