From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Sun, 1 Aug 2010 11:15:27 +0000 (+0200)
Subject: Fix regression in colorization of zippy-matched commands
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=32d6537664a734207772608507882f5a682a2c0a;p=xboard.git

Fix regression in colorization of zippy-matched commands

The patch by Daniel Mehrman from 4.2.pre8 was not properly merged, so
that in XBoard no coloration would take place of ICS commands that were
matched by zippy. (It was using &i as input pointer, rather than &backup.
The XBoard-specific code now has been deleted completely, to remove a
seemingly needless dependence on _WIN32_ of the back-end. Both WB and XB
now use the XBoard method, to only match zippy commands when logged in.
---

diff --git a/backend.c b/backend.c
index 661476c..1c25faa 100644
--- a/backend.c
+++ b/backend.c
@@ -2838,18 +2838,9 @@ read_from_ics(isr, closure, data, count, error)
                 /* [DM] Backup address for color zippy lines */
                 backup = i;
 #if ZIPPY
-       #ifdef WIN32
                if (loggedOn == TRUE)
                        if (ZippyControl(buf, &backup) || ZippyConverse(buf, &backup) ||
                           (appData.zippyPlay && ZippyMatch(buf, &backup)));
-       #else
-                if (ZippyControl(buf, &i) ||
-                    ZippyConverse(buf, &i) ||
-                    (appData.zippyPlay && ZippyMatch(buf, &i))) {
-		      loggedOn = TRUE;
-                      if (!appData.colorize) continue;
-		}
-       #endif
 #endif
 	    } // [DM] 'else { ' deleted
 	 	if (