From: Arun Persaud <arun@nubati.net>
Date: Wed, 4 Nov 2009 02:42:34 +0000 (-0800)
Subject: Merge commit 'v4.4.1.20091022' into gtk
X-Git-Tag: gtk-20091122~7
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=662a8073971f934e63c645511bc66e292dc9c131

Merge commit 'v4.4.1.20091022' into gtk

Conflicts:
	backend.c
	configure.ac
	xboard.c
---

662a8073971f934e63c645511bc66e292dc9c131
diff --cc backend.c
index 37521d7,7cd8dd7..febfae0
--- a/backend.c
+++ b/backend.c
@@@ -3527,10 -3528,10 +3527,10 @@@ ParseBoard12(string
         different game than is currently being displayed.  */
      if (gamenum != ics_gamenum || newGameMode != gameMode ||
  	relation == RELATION_ISOLATED_BOARD) {
 -	
 +
  	/* Forget the old game and get the history (if any) of the new one */
  	if (gameMode != BeginningOfGame) {
- 	  Reset(FALSE, TRUE);
+ 	  Reset(TRUE, TRUE);
  	}
  	newGame = TRUE;
  	if (appData.autoRaiseBoard) BoardToTop();
@@@ -3757,8 -3771,9 +3770,9 @@@
  	    sprintf(str, "%smoves %d\n", ics_prefix, gamenum);
  	    SendToICS(str);
  	}
+ 	forwardMostMove = backwardMostMove = currentMove = moveNum;
      }
 -    
 +
      /* Update the clocks */
      if (strchr(elapsed_time, '.')) {
        /* Time is in ms */