* fontset.c, window.c, xdisp.c (toplevel): Use TERM_HEADER.

* xfaces.c (toplevel) [HAVE_X_WINDOWS]: Do not include xterm.h twice.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3ef8bee2f0b38a09ae9beba0ed2f0d3780a9a392..d4a7abefd57ee050c3c618772ee2bf9f6213e11f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * 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  <dmantipov@yandex.ru>
 
        Make --without-x compatible with --enable-gcc-warnings.

diff --git a/src/fontset.c b/src/fontset.c
index a6277b050d53c5f99ebcb63f63c0fd752feab173..797d51ac0a76895544b7e650f7f1eed5e55e977d 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -39,17 +39,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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

diff --git a/src/window.c b/src/window.c
index ef96861dc71051b22fda2470294a60318a7f5438..d8a6976e090ce9885bbfa10668f6365a3ba18874 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -39,19 +39,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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;

diff --git a/src/xdisp.c b/src/xdisp.c
index d68362576fa2da51fe9926dba7f05896c3355974..c096fcd340fc2d77ecf543d56e646cd301607a00 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -299,19 +299,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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)

diff --git a/src/xfaces.c b/src/xfaces.c
index 0a117b83c15462d6a295fe49538b1e5ead614918..e8cb7a703221d05880ac06f73fe98782c2f629bc 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -211,13 +211,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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"