* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,

around image definitions and prototypes.
(gamma_correct) [WINDOWSNT]: New prototype.

* w32term.c (x_make_frame_visible): Replace call to
input_poll_signal with poll_for_input.

* window.c [WINDOWSNT]: Include w32term.h.

* xdisp.c [WINDOWSNT]: Include w32term.h.

* makefile.nt: Add dependencies on w32gui.h.
(OBJ1): Include atimer.obj.
($(BLD)\atimer.obj): New dependency rule.

* w32.c (sigmask): New function (does nothing).
(sigunblock): Ditto.

* frame.c [WINDOWSNT]: Include w32term.h.

* w32gui.h (struct W32FontStruct): Add ascent and descent slots.

* lread.c (syms_of_lread): Fix literal newlines.

* emacs.c (USAGE): Split into USAGE1 and USAGE2, to work-around
the string constant limit (2048 bytes) in MSVC.
(main): Ditto.

7 files changed, 52 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index ac4cfd77521..1445c236082 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ _$*
 core
 # CVS default ignores end
 configure
+bin
diff --git a/lib-src/.gitignore b/lib-src/.gitignore
index b5eea5caab4..a8bbe52aa8b 100644
--- a/lib-src/.gitignore
+++ b/lib-src/.gitignore
@@ -15,3 +15,6 @@ etags
 ctags
 emacsclient
 b2m
+DOC
+obj
+obj-spd
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b5166ae8c3..5948451a086 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-02-06  Andrew Innes  <andrewi@gnu.org>
+
+        * term/w32-win.el (x-handle-args): Comment out call to message,
+        which occurs before window system is initialized.
+
+        * makefile.nt: Add support for recompiling lisp code.
+
 2000-02-04  Dave Love  <fx@gnu.org>
 
         * bindings.el (mode-line-mule-info): Fix/extend last change.
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 6032c6d80c3..0e499a26386 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-06  Andrew Innes  <andrewi@gnu.org>
+
+        * inc/sys/time.h: Add inclusion protection.
+
+        * makefile.def (SYS_LDFLAGS): Add -nologo.
+
 1999-11-22  Andrew Innes  <andrewi@gnu.org>
 
         * install.bat: Pass on command line arguments to make.
diff --git a/src/.gitignore b/src/.gitignore
index 99af0328a10..661faaf62a4 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -9,3 +9,5 @@ temacs
 emacs
 emacs-*
 *.core
+obj
+obj-spd
diff --git a/src/ChangeLog b/src/ChangeLog
index 9bc3d6ab634..0f1696327a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,33 @@
+2000-02-06  Andrew Innes  <andrewi@gnu.org>
+
+        * dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
+        around image definitions and prototypes.
+        (gamma_correct) [WINDOWSNT]: New prototype.
+
+        * w32term.c (x_make_frame_visible): Replace call to
+        input_poll_signal with poll_for_input.
+
+        * window.c [WINDOWSNT]: Include w32term.h.
+
+        * xdisp.c [WINDOWSNT]: Include w32term.h.
+
+        * makefile.nt: Add dependencies on w32gui.h.
+        (OBJ1): Include atimer.obj.
+        ($(BLD)\atimer.obj): New dependency rule.
+
+        * w32.c (sigmask): New function (does nothing).
+        (sigunblock): Ditto.
+
+        * frame.c [WINDOWSNT]: Include w32term.h.
+
+        * w32gui.h (struct W32FontStruct): Add ascent and descent slots.
+
+        * lread.c (syms_of_lread): Fix literal newlines.
+
+        * emacs.c (USAGE): Split into USAGE1 and USAGE2, to work-around
+        the string constant limit (2048 bytes) in MSVC.
+        (main): Ditto.
+
 2000-02-05  INOUE Seiichiro <inoue@ainet.or.jp>
 
         * xterm.c (x_display_and_set_cursor) [HAVE_X_I18N]: Set pre-edit
diff --git a/src/xdisp.c b/src/xdisp.c
index e6c304501ed..7a3f25c5494 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -190,6 +190,9 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
 #endif
+#ifdef WINDOWSNT
+#include "w32term.h"
+#endif
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))