[Emacs-diffs] trunk r114179: Do not populate pure Xism x_sync to other ports.

[Dmitry Antipov]

------------------------------------------------------------
revno: 114179
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-09 18:01:02 +0400
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
  src/w32term.h                  w32term.h-20091113204419-o5vbwnq5f7feedwu-954
  src/w32xfns.c                  w32xfns.c-20091113204419-o5vbwnq5f7feedwu-951

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-09 12:15:45 +0000
+++ b/src/ChangeLog     2013-09-09 14:01:02 +0000
@@ -1,5 +1,13 @@
 2013-09-09  Dmitry Antipov  <address@hidden>
 
+       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  <address@hidden>
+
        Cleanup frame flushing.
        * dispextern.h (struct redisplay_interface): Drop
        flush_display_optional because flush_display is enough

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-09-06 07:00:29 +0000
+++ b/src/frame.c       2013-09-09 14:01:02 +0000
@@ -1108,7 +1108,7 @@
 
       /* 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

=== modified file 'src/frame.h'
--- a/src/frame.h       2013-09-09 12:15:45 +0000
+++ b/src/frame.h       2013-09-09 14:01:02 +0000
@@ -1243,7 +1243,6 @@
 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 @@
 #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 *);

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2013-08-13 08:58:15 +0000
+++ b/src/nsfns.m       2013-09-09 14:01:02 +0000
@@ -2231,15 +2231,6 @@
   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'.

=== modified file 'src/w32term.h'
--- a/src/w32term.h     2013-08-13 18:01:18 +0000
+++ b/src/w32term.h     2013-09-09 14:01:02 +0000
@@ -211,7 +211,6 @@
                               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);

=== modified file 'src/w32xfns.c'
--- a/src/w32xfns.c     2013-08-03 03:29:03 +0000
+++ b/src/w32xfns.c     2013-09-09 14:01:02 +0000
@@ -333,9 +333,3 @@
     }
   return retval;
 }
-
-/* x_sync is a no-op on W32.  */
-void
-x_sync (struct frame *f)
-{
-}