# HG changeset patch
# User Andrew Innes <andrewi@gnu.org>
# Date 949880271 0
# Node ID 6c9ee29e89556f3aced2ff42edcf6ed370cf7be2
# Parent  ab6c81c6edf80c710bbfb3f55648c07da5859f65
* 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.

diff -r ab6c81c6edf8 -r 6c9ee29e8955 .cvsignore
--- a/.cvsignore	Sun Feb 06 23:37:49 2000 +0000
+++ b/.cvsignore	Sun Feb 06 23:37:51 2000 +0000
@@ -1,1 +1,2 @@
 configure
+bin
diff -r ab6c81c6edf8 -r 6c9ee29e8955 lib-src/.cvsignore
--- a/lib-src/.cvsignore	Sun Feb 06 23:37:49 2000 +0000
+++ b/lib-src/.cvsignore	Sun Feb 06 23:37:51 2000 +0000
@@ -15,3 +15,6 @@
 ctags
 emacsclient
 b2m
+DOC
+obj
+obj-spd
diff -r ab6c81c6edf8 -r 6c9ee29e8955 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Feb 06 23:37:49 2000 +0000
+++ b/lisp/ChangeLog	Sun Feb 06 23:37:51 2000 +0000
@@ -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 -r ab6c81c6edf8 -r 6c9ee29e8955 nt/ChangeLog
--- a/nt/ChangeLog	Sun Feb 06 23:37:49 2000 +0000
+++ b/nt/ChangeLog	Sun Feb 06 23:37:51 2000 +0000
@@ -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 -r ab6c81c6edf8 -r 6c9ee29e8955 src/.cvsignore
--- a/src/.cvsignore	Sun Feb 06 23:37:49 2000 +0000
+++ b/src/.cvsignore	Sun Feb 06 23:37:51 2000 +0000
@@ -9,3 +9,5 @@
 emacs
 emacs-*
 *.core
+obj
+obj-spd
diff -r ab6c81c6edf8 -r 6c9ee29e8955 src/ChangeLog
Binary file src/ChangeLog has changed
diff -r ab6c81c6edf8 -r 6c9ee29e8955 src/xdisp.c
--- a/src/xdisp.c	Sun Feb 06 23:37:49 2000 +0000
+++ b/src/xdisp.c	Sun Feb 06 23:37:51 2000 +0000
@@ -190,6 +190,9 @@
 #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))