# HG changeset patch
# User Geoff Voelker <voelker@cs.washington.edu>
# Date 893824492 0
# Node ID 87c7f4bd99da16cc61239eb515a1a73d56e57584
# Parent  d18b1d70025c41ce0f72bfbb7b7595e0dd85dad5
Include cm.h after dispextern.h to avoid name conflicts
in Windows system headers.
(term_init) [WINDOWSNT]: Do not include remainder of function.

diff -r d18b1d70025c -r 87c7f4bd99da src/term.c
--- a/src/term.c	Wed Apr 29 04:34:29 1998 +0000
+++ b/src/term.c	Wed Apr 29 04:34:52 1998 +0000
@@ -24,7 +24,6 @@
 #include <ctype.h>
 #include "termchar.h"
 #include "termopts.h"
-#include "cm.h"
 #undef NULL
 #include "lisp.h"
 #include "charset.h"
@@ -34,6 +33,7 @@
 #include "termhooks.h"
 #include "keyboard.h"
 #include "dispextern.h"
+#include "cm.h"
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
 #endif
@@ -1604,7 +1604,7 @@
   FRAME_VERTICAL_SCROLL_BAR_TYPE (selected_frame) = vertical_scroll_bar_none;
 
   return;
-#endif /* WINDOWSNT */
+#else  /* not WINDOWSNT */
 
   Wcm_clear ();
 
@@ -1929,6 +1929,7 @@
 
   FRAME_CAN_HAVE_SCROLL_BARS (selected_frame) = 0;
   FRAME_VERTICAL_SCROLL_BAR_TYPE (selected_frame) = vertical_scroll_bar_none;
+#endif /* WINDOWSNT */
 }
 
 /* VARARGS 1 */