--- a/w32/ChangeLog	Mon Aug 13 10:05:01 2007 +0200
+++ b/w32/ChangeLog	Mon Aug 13 10:05:51 2007 +0200
@@ -1,94 +1,140 @@
-Wed November 05 23:40:00 1997 <jhar@tardis.ed.ac.uk>
+Thu September 25 23:06:44 1997 davidh
+
+	* xemacs.mak updated to make the build as simple as typing
+	  nmake -f xemacs.mak. Also support for native gui included 
+	  which should mean the w32 directory is no longer required.
+
+	* config.h synced with config.h.in from 20.3-b2
+
+	* synced in changes to support native gui.
 
-	* faces.el: init-other-random-faces
- 	  Reinstated code that uses (mono x) as a specifer tag, but
-	  conditioned it on (featurep 'x) because x is not a valid
-	  specifier tag under native-win32.
-	
-	* fileio.c: insert-file-contents-internal
-	  Added a bodge to do CRLF->LF conversion of text files,
-	  conditioned on DOS_NT. This is currently only one-way, so all
-	  text files written by XEmacs will be UNIXified. CRLF conversion
-	  is required to make bytecompile work.
-	
-	* w32/xemacs.mak: moved building the DOC file to after the .elcs.
-	
-	* Added file headers to:
-	  w32-faces.el, w32-init.el, console-w32.c, console-w32.h,
-	  device-w32.c, event-w32.c, event-w32.h, frame-w32.c,
-	  objects-w32.c, objects-w32.h, redisplay-w32.c, w32-proc.c
+Thu September 25 23:06:44 1997 davidh
+
+	* August Hill provided a patch to xemacs.mak to greatly simplify
+	  the build - the DOC file gets created correctly. 
+
+Tue September 22 23:06:44 1997 davidh
+
+	* August Hill provided some more patches - to expand ~ correctly
+          and to correctly deal with drive letters in the path.
+
+	* emacs.c patched to call init_ntproc()
 
 
-Sun November 01 12:00:00 1997 <jhar@tardis.ed.ac.uk>
-
-	* make-docfile.el: Fixed typo when dumped file does not exist.
+Tue July 15 19:32:21 1997 davidh
 
-	* redisplay-x.c: x_output_vertical_divider:
-	  If HAVE_SCROLLBARS was not defined, coordinate of the right of
-	  the divider was being used unitialised.
+        * August Hill provided some more patches to make things better
+          - there is a workaround for dired to make the ^M's disappear
+          - a patch to fix shell-command
 
-	* device.el: make-w32-device added.
-
-	* dumped-lisp: added w32-faces and w32-init to list.
+Tue July 08 22:01:36 1997 davidh
 
-	* faces.el:
-	  - make-face-*: Added calls to appropriate w32 functions
-	    conditioned on (featurep 'w32). Made existing X calls
-	    conditioned on (featurep 'x).
-	  - init-other-random-faces: Hacked out a piece of code which used
-	    (mono x) as a specifier because it made w32 unhappy.
-
-	* console.h: Added Qw32 and CONSOLE_W32* macros, conditioned on
-	  HAVE_W32GUI.
+        * #ifdef'd call to vfork and replaced with spawn as per GNU Emacs;
+          as a result, removed /force - XEmacs now links normally.
 
-	* emacs.c: Added calls to the following, conditioned on HAVE_W32GUI:
-	  syms_of_*_w32, vars_of_*_w32, console_type_create_*w32.
-
-	* event-stream.c: Conditioned on HAVE_W32GUI:
-	  - vars_of_event_stream calls vars_of_event_w32.
-	  - init_event_stream calls init_event_w32_late.
+Thu June 31 21:16:21 1997 davidh
 
-	* events-mod.h: Removed comment about having alternative making
-	  MOD_* constants for different windowing systems.
+	* nt/TODO created.
 
-	* events.c: Conditioned on HAVE_W32GUI:
-	  - event-equal: Added case for w32 magic events.
-	  - event-hash: Added case for w32 magic events.
+	* nt/X11.patch created to help with the X build.
 	
-	* events.h: Conditioned on HAVE_W32GUI:
-	  Added struct underlying_w32_event to magic_data.
+	* August Hill provided:
+ 	  a patch to fix the _WRETCODE undefined symbol,
+	  a patch to fix a problem with dired
+
+	  and generally helped clarify the build instructions.
+
+ 	* Synced with 20.3b10 (Athens).
+
+	* Made DIRECTORY_SEP be '\\'. Until I can change all code to
+          use the macro, I decided this would be easiest.
 
-	* faces.c: complex_vars_of_faces
-	  Added fallbacks for w32 faces, conditioned on HAVE_W32GUI.
+	* Modified src/fileio.c to only open files in O_BINARY. This
+	  causes files to be opened and written without automatically 
+	  writing ^M 's to the end of each line. MULE ought to sort this
+          in theory, but I am less than convinced.
+
+	* Updated the nt/README to provide a little more help.
+
+Thu May 29 23:11:21 1997 davidh
+
+	* Synced with 20.3b2.
 
-	* frame.c: set-frame-properties
-	  Added reference to default-w32-frame-plist to docstring.
+	* Removed nt/README.src, nt/src.m.windowsnt.h nt/src.s.windowsnt.h.
+
+	* Updated README from marcpa.
+
+	* Added example Win32.cf and site.def files for X.
 
-	* general.c: Added new Lisp_Object Qw32 and defsymbol.
+	* Added sed.exe into nt/.
+
+	* Modified nt/xemacs.mak to pass correct flags to lwlib compile.
+
+	* Added extra .elc files to ensure make-docfile gets all symbols.
 
-	* redisplay-output.c: redisplay_update_line
-	  Conditioned reference to stupid_vertical_scrollbar_drag_hack on
-	  HAVE_X_WINDOWS. This will need a proper fix when w32 gets
-	  scrollbars.
+	* Modified balloon_help.c to compile (#if'd max definition)
+
+	* Modified src/event-Xt.c so as not to add signal_event_pipe to
+          be selected on - this is a hack until I can work out a better
+          way. Thanks to Ben Wing for help on this.
+
+Thu Mar 27 20:56:21 1997  marcpa  (marcpa at MARCPA)
+
+	* Synced with 20.1b9.
+
+Sun Mar 16 00:32:15 1997  marcpa  (marcpa at MARCPA)
 
-	* redisplay-tty.c: init_tty_for_redisplay
-	  Conditioned blocking and unblocking of SIGTTOU on !WIN32 because
-	  these signals don't exist under win32.
+	* lisp/eterm/README.term is truncated: is it just me (because
+	I'm on NT) or everyone else sees this ?
+	Answer: it is because it contains a ^Z embedded in it, therefore
+	it needs to be inserted in binary mode in CVS.
+
+Thu Mar 13 00:19:25 1997  marcpa  (marcpa at MARCPA)
+
+	* At end of compilation, there are some unresolved symbols: 
 
-	* redisplay.c: init_redisplay
-	  Initialise window system to w32, conditioned on HAVE_W32GUI.
-	  
-	* symsinit.h: Added syms_of_*_w32, vars_of_*_w32 and
-	  init_event_w32_late.
+link.exe @C:\TEMP\nma00115.
+sysdep.obj : error LNK2001: unresolved external symbol _vfork
+../src/temacs.exe : warning LNK4088: image being generated due to /FORCE
+option; image may not run
+
+
+Wed Mar 12 23:18:53 1997  marcpa  (marcpa at MARCPA)
+
+	* Need to copy the nt/inc directory David originally submitted or
+	NT code won't compile.
+
+	* Need to copy nt/{config.h,paths.h,ad2c.sed,xemacs.mak} in src.
+
+	* Had to modify XEmacs sources here and there : see the diffs
+	between NT_FIRST_COMPILE and V20_1_beta9.
 
-	* sysdep.c: Conditioned various things on WIN32 in addition to
-	  MSDOS.
-	
-	* New files:
-	  w32-faces.el, w32-init.el, console-w32.c, console-w32.h,
-	  device-w32.c, event-w32.c, event-w32.h, frame-w32.c,
-	  objects-w32.c, objects-w32.h, redisplay-w32.c, w32-proc.c
+	* Needed to patch X11R6.3 sources: (include/x11/Xmd.h:155) BOOL is
+	already defined by Windows and is a long, while X wants it to be
+	an unsigned char.
+
+--- Xmd.h~	Thu Jun 08 23:20:40 1995
++++ Xmd.h	Sun Mar 16 13:09:10 1997
+@@ -150,8 +150,9 @@
+ typedef CARD16		BITS16;
+ typedef CARD8		BYTE;
+ 
++#ifndef WIN32
+ typedef CARD8           BOOL;
+-
++#endif
 
-	* Files split from nt to new w32 directory:
-	  ChangeLog, README, Todo, paths.h, config.h, inc/*, runemacs.c,
-	  xemacs.mak.
+	* cpp.exe not used: cl.exe from VC++4.2 seems to handle everything
+	properly. 
+
+NOTES:
+
+Compilation with nmake -f xemacs.mak.
+
+Using X11R6.3 for NT.
+
+Work started with 20.1b2.
+
+Local Variables:
+mode: change-log
+End: