diff options
| author | Dmitry Antipov | 2013-09-05 16:08:50 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-09-05 16:08:50 +0400 |
| commit | 667383058ff503073f9e094ab3c88280748857ef (patch) | |
| tree | a7414a0db692cdc8aad04dd9919478f8a94ea0f7 /src/window.c | |
| parent | 6aed5dccd0b87e6c32345b4914dcb50eea399327 (diff) | |
| download | emacs-667383058ff503073f9e094ab3c88280748857ef.tar.gz emacs-667383058ff503073f9e094ab3c88280748857ef.zip | |
* fontset.c, window.c, xdisp.c (toplevel): Use TERM_HEADER.
* xfaces.c (toplevel) [HAVE_X_WINDOWS]: Do not include xterm.h twice.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/window.c b/src/window.c index ef96861dc71..d8a6976e090 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -39,19 +39,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 39 | #include "blockinput.h" | 39 | #include "blockinput.h" |
| 40 | #include "intervals.h" | 40 | #include "intervals.h" |
| 41 | #include "termhooks.h" /* For FRAME_TERMINAL. */ | 41 | #include "termhooks.h" /* For FRAME_TERMINAL. */ |
| 42 | 42 | #ifdef HAVE_WINDOW_SYSTEM | |
| 43 | #ifdef HAVE_X_WINDOWS | 43 | #include TERM_HEADER |
| 44 | #include "xterm.h" | 44 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 45 | #endif /* HAVE_X_WINDOWS */ | ||
| 46 | #ifdef HAVE_NTGUI | ||
| 47 | #include "w32term.h" | ||
| 48 | #endif | ||
| 49 | #ifdef MSDOS | 45 | #ifdef MSDOS |
| 50 | #include "msdos.h" | 46 | #include "msdos.h" |
| 51 | #endif | 47 | #endif |
| 52 | #ifdef HAVE_NS | ||
| 53 | #include "nsterm.h" | ||
| 54 | #endif | ||
| 55 | 48 | ||
| 56 | Lisp_Object Qwindowp, Qwindow_live_p; | 49 | Lisp_Object Qwindowp, Qwindow_live_p; |
| 57 | static Lisp_Object Qwindow_valid_p; | 50 | static Lisp_Object Qwindow_valid_p; |