procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not populate pure Xism x_sync to other ports.

Browse source 
* 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.
This commit is contained in:
Dmitry Antipov 2013-09-09 18:01:02 +04:00
parent fd462129af
commit 83fc055439
6 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
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.

2
src/frame.c
View file

@ -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

4
src/frame.h
View file

@ -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 *);

9
src/nsfns.m
View file

@ -2231,15 +2231,6 @@ and GNUstep implementations ("distributor-specific release
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'.

1
src/w32term.h
View file

@ -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);

6
src/w32xfns.c
View file

@ -333,9 +333,3 @@ drain_message_queue (void)
}
return retval;
}
/* x_sync is a no-op on W32. */
void
x_sync (struct frame *f)
{
}