[Emacs-diffs] trunk r114144: * fontset.c, window.c, xdisp.c (toplevel): Use TERM_HEADER.

[Dmitry Antipov]

------------------------------------------------------------
revno: 114144
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-09-05 16:08:50 +0400
message:
  * fontset.c, window.c, xdisp.c (toplevel): Use TERM_HEADER.
  * xfaces.c (toplevel) [HAVE_X_WINDOWS]: Do not include xterm.h twice.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/fontset.c                  fontset.c-20091113204419-o5vbwnq5f7feedwu-1079
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-05 06:25:12 +0000
+++ b/src/ChangeLog     2013-09-05 12:08:50 +0000
@@ -1,5 +1,10 @@
 2013-09-05  Dmitry Antipov  <address@hidden>
 
+       * fontset.c, window.c, xdisp.c (toplevel): Use TERM_HEADER.
+       * xfaces.c (toplevel) [HAVE_X_WINDOWS]: Do not include xterm.h twice.
+
+2013-09-05  Dmitry Antipov  <address@hidden>
+
        Make --without-x compatible with --enable-gcc-warnings.
        * font.c (register_font_driver): Move check under HAVE_WINDOW_SYSTEM.
        * font.h (struct font_driver): Move draw, get_bitmap and free_bitmap

=== modified file 'src/fontset.c'
--- a/src/fontset.c     2013-09-01 09:59:19 +0000
+++ b/src/fontset.c     2013-09-05 12:08:50 +0000
@@ -39,17 +39,10 @@
 #include "intervals.h"
 #include "fontset.h"
 #include "window.h"
-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
-#endif
-#ifdef HAVE_NTGUI
-#include "w32term.h"
-#endif
-#ifdef HAVE_NS
-#include "nsterm.h"
-#endif
+#ifdef HAVE_WINDOW_SYSTEM
+#include TERM_HEADER
+#endif /* HAVE_WINDOW_SYSTEM */
 #include "termhooks.h"
-
 #include "font.h"
 
 /* FONTSET

=== modified file 'src/window.c'
--- a/src/window.c      2013-09-01 16:21:48 +0000
+++ b/src/window.c      2013-09-05 12:08:50 +0000
@@ -39,19 +39,12 @@
 #include "blockinput.h"
 #include "intervals.h"
 #include "termhooks.h"         /* For FRAME_TERMINAL.  */
-
-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
-#endif /* HAVE_X_WINDOWS */
-#ifdef HAVE_NTGUI
-#include "w32term.h"
-#endif
+#ifdef HAVE_WINDOW_SYSTEM
+#include TERM_HEADER
+#endif /* HAVE_WINDOW_SYSTEM */
 #ifdef MSDOS
 #include "msdos.h"
 #endif
-#ifdef HAVE_NS
-#include "nsterm.h"
-#endif
 
 Lisp_Object Qwindowp, Qwindow_live_p;
 static Lisp_Object Qwindow_valid_p;

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-09-05 06:25:12 +0000
+++ b/src/xdisp.c       2013-09-05 12:08:50 +0000
@@ -299,19 +299,9 @@
 #include "font.h"
 #include "fontset.h"
 #include "blockinput.h"
-
-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
-#endif
-#ifdef HAVE_NTGUI
-#include "w32term.h"
-#endif
-#ifdef HAVE_NS
-#include "nsterm.h"
-#endif
-#ifdef USE_GTK
-#include "gtkutil.h"
-#endif
+#ifdef HAVE_WINDOW_SYSTEM
+#include TERM_HEADER
+#endif /* HAVE_WINDOW_SYSTEM */
 
 #ifndef FRAME_X_OUTPUT
 #define FRAME_X_OUTPUT(f) ((f)->output_data.x)

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2013-09-05 06:25:12 +0000
+++ b/src/xfaces.c      2013-09-05 12:08:50 +0000
@@ -211,13 +211,10 @@
 #include "frame.h"
 #include "termhooks.h"
 
-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
 #ifdef USE_MOTIF
 #include <Xm/Xm.h>
 #include <Xm/XmStrDefs.h>
 #endif /* USE_MOTIF */
-#endif /* HAVE_X_WINDOWS */
 
 #ifdef MSDOS
 #include "dosfns.h"