From: Arun Persaud <arun@nubati.net>
Date: Fri, 8 May 2015 15:00:11 +0000 (-0700)
Subject: Merge branch 'v4.8.x' into master
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=ba12e63149a003b88b8525d6eb50d48539c660b6

Merge branch 'v4.8.x' into master
---

ba12e63149a003b88b8525d6eb50d48539c660b6
diff --cc backend.c
index d6b293b,e68b3af..295b600
--- a/backend.c
+++ b/backend.c
@@@ -7361,11 -7322,11 +7363,11 @@@ CanPromote (ChessSquare piece, int y
  	if(IS_SHOGI(gameInfo.variant)          || gameInfo.variant == VariantXiangqi ||
  	   gameInfo.variant == VariantSuper    || gameInfo.variant == VariantGreat   ||
  	   gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier ||
-          gameInfo.variant == VariantMakruk   || gameInfo.variant == VariantASEAN) return FALSE;
+          gameInfo.variant == VariantMakruk) return FALSE;
  	return (piece == BlackPawn && y <= zone ||
  		piece == WhitePawn && y >= BOARD_HEIGHT-1-zone ||
 -		piece == BlackLance && y == 1 ||
 -		piece == WhiteLance && y == BOARD_HEIGHT-2 );
 +		piece == BlackLance && y <= zone ||
 +		piece == WhiteLance && y >= BOARD_HEIGHT-1-zone );
  }
  
  void
diff --cc gtk/xboard.c
index b2c080c,ef35f2a..dbcc9e5
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@@ -2319,8 -2319,11 +2319,14 @@@ void FileNamePopUpWrapper(label, def, f
    char *cp;
    char curDir[MSG_SIZ];
  
 +  StartDir(filter, NULL); // change to start directory for this file type
 +
+   if(def && *def && def[strlen(def)-1] == '/') {
+     getcwd(curDir, MSG_SIZ);
+     chdir(def);
+   }
+ 
++
    /* make a copy of the filter string, so that strtok can work with it*/
    cp = strdup(filter);
  
diff --cc po/LINGUAS
index aaf1d8a,80d877b..c2e114e
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@@ -1,3 -1,3 +1,3 @@@
  # whitespace separated list of translated languages goes below
  # note: zh translations are untested; xboard fails to create a fontset for them
- da de es fr it nl pl ru tr uk vi zh_CN zh_HK zh_TW
 -da de es it nl pl ru sr tr uk vi zh_CN zh_HK zh_TW
++da de es fr it nl pl ru sr tr uk vi zh_CN zh_HK zh_TW