From 6cf84916e6bd3c60075dd7ce351a04e93d417136 Mon Sep 17 00:00:00 2001
From: Tim Mann <tim@tim-mann.org>
Date: Fri, 28 Nov 2003 09:37:36 +0000
Subject: [PATCH] Last (?) round of small changes for 4.2.7; see new ChangeLog entries.

---
 ChangeLog         |    5 +++++
 Makefile.in       |   10 +++++-----
 ToDo              |    7 -------
 backend.c         |   10 ++++++++++
 configure.in      |    2 +-
 winboard/config.h |    2 +-
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62140d0..313e8f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 ChangeLog for XBoard/WinBoard
 
+* 11/26/2003: In WinBoard, setting the -debug flag now logs ICS output
+to WinBoard.debug too.  (This isn't needed in xboard because ICS
+output already goes to stdout, so it's easy to capture along with the
+debug output on stderr.)  This was issue #280 in the ToDo file.
+
 * 11/23/2003: Cleaned up some minor problems in cygwin.mak.  Thanks to
 Hans Werner Strube for the problem report.
 
diff --git a/Makefile.in b/Makefile.in
index 75770ef..70b5808 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,14 +91,14 @@ uninstall:
 
 clean:
 	rm -f xboard zic2xpm *.o xboard.txt zic2xpm.txt $(LEX_OUTPUT_ROOT).c
-	rm -f xboard_*.html xboard.aux* xboard.cp* xboard.dvi xboard.fn*
+	rm -f xboard*.html xboard.aux* xboard.cp* xboard.dvi xboard.fn*
 	rm -f xboard.ky* xboard.log xboard.pg* xboard.toc xboard.tp*
 	rm -f xboard.vr* xboard.ps
 
 distclean: clean tidy
 	rm -f config.cache config.log config.status Makefile 
 	rm -f config.h stamp-h xboard.texinfo cmail
-	cd winboard ; make -f cygwin.mak clean
+	-cd winboard ; make -f cygwin.mak clean
 
 mostlyclean: clean
 
@@ -106,7 +106,7 @@ maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f $(PSEUDOSOURCE)
-	cd winboard ; make -f cygwin.mak maintainer-clean
+	-cd winboard ; make -f cygwin.mak maintainer-clean
 
 TAGS:
 	etags *.c *.h
@@ -126,9 +126,9 @@ dvi: xboard.dvi
 xboard.dvi: xboard.texinfo xboard.texi gpl.texinfo configure.in
 	TEXINPUTS=.:$(srcdir): texi2dvi xboard.texinfo
 
-html: xboard_toc.html
+html: xboard.html
 
-xboard_toc.html: xboard.texinfo xboard.texi gpl.texinfo configure.in
+xboard.html: xboard.texinfo xboard.texi gpl.texinfo configure.in
 	texi2html -split_chapter -I $(srcdir) xboard.texinfo
 
 FAQ: FAQ.html
diff --git a/ToDo b/ToDo
index edfcea8..62be85a 100644
--- a/ToDo
+++ b/ToDo
@@ -457,9 +457,6 @@ windows explorer then crashed when he tried to close winboard.
 not words.  [Or maybe both?]  Also might be easier to select
 accurately from it if horizontally arranged, or in a 3x2 grid.
 
-280. Need a way to log raw ICS i/o in WinBoard.debug file, as xboard's
-debug mode does.  Would help in finding bugs at times.
-
 284. dxterm hangs when it receives the escape sequence that sets the
 title bar on xterm.  I think some other xterm substitutes do too.
 
@@ -1256,10 +1253,6 @@ queen piece. I couldnt drop it to any square."
 535. For protover 3, the "st" command in the protocol could be
 extended to allow for smaller units, not just seconds.
 
-536. Funny bug where tags show up as "?" on XP when they shouldn't.
-See a couple of emails.  [This may have been the gamelist offset bug
-that was fixed in 4.2.7.]
-
 537. Clarify in the protocol that "force" while searching means you
 should stop the search as soon as you can.  (Isn't this clear
 already?)
diff --git a/backend.c b/backend.c
index b9e1df5..f28d863 100644
--- a/backend.c
+++ b/backend.c
@@ -1455,6 +1455,16 @@ read_from_ics(isr, closure, data, count, error)
     int tkind;
     char *p;
 
+#ifdef WIN32
+    if (appData.debugMode) {
+      if (!error) {
+	fprintf(debugFP, "<ICS: ");
+	show_bytes(debugFP, data, count);
+	fprintf(debugFP, "\n");
+      }
+    }
+#endif
+
     if (count > 0) {
 	/* If last read ended with a partial line that we couldn't parse,
 	   prepend it to the new read and try again. */
diff --git a/configure.in b/configure.in
index e5f5936..c7f55f6 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ AC_CONFIG_HEADER(config.h)
 
 PRODUCT=xboard
 VERSION=4.2
-PATCHLEVEL=pre7
+PATCHLEVEL=7
 
 if test -z "$CFLAGS" ; then
 dnl| Prevent the next macro from setting CFLAGS to -g
diff --git a/winboard/config.h b/winboard/config.h
index c10b2fc..8d76073 100644
--- a/winboard/config.h
+++ b/winboard/config.h
@@ -37,7 +37,7 @@
 
 #define LAST_PTY_LETTER 'q'
 
-#define PATCHLEVEL "pre7"
+#define PATCHLEVEL "7"
 
 #define PRODUCT "WinBoard"
 
-- 
1.7.0.4