Merge commit 'v4.4.1' into gtk

Conflicts:
	backend.c
	configure.ac
	xboard.c

diff --cc backend.c
index febfae0,6f4fa71..3dce31a
--- 1/backend.c
--- 2/backend.c
+++ b/backend.c
@@@ -3395,10 -3400,10 +3399,10 @@@ ParseBoard12(string
      char promoChar;
      int ranks=1, files=0; /* [HGM] ICS80: allow variable board size */
      char *bookHit = NULL; // [HGM] book
-     Boolean weird = FALSE;
+     Boolean weird = FALSE, reqFlag = FALSE;
  
      fromX = fromY = toX = toY = -1;
 -    
 +
      newGame = FALSE;
  
      if (appData.debugMode)
@@@ -13100,27 -13024,24 +13104,23 @@@ DisplayComment(moveNumber, text
      char title[MSG_SIZ];
      char buf[8000]; // comment can be long!
      int score, depth;
- 
-     if( appData.autoDisplayComment ) {
-         if (moveNumber < 0 || parseList[moveNumber][0] == NULLCHAR) {
-           strcpy(title, "Comment");
-         } else {
-           sprintf(title, "Comment on %d.%s%s", moveNumber / 2 + 1,
-                   WhiteOnMove(moveNumber) ? " " : ".. ",
-                   parseList[moveNumber]);
-         }
-       // [HGM] PV info: display PV info together with (or as) comment
-       if(moveNumber >= 0 && (depth = pvInfoList[moveNumber].depth) > 0) {
-           if(text == NULL) text = "";
-           score = pvInfoList[moveNumber].score;
-           sprintf(buf, "%s%.2f/%d %d\n%s", score>0 ? "+" : "", score/100.,
-                               depth, (pvInfoList[moveNumber].time+50)/100, text);
-           text = buf;
-       }
-     } else title[0] = 0;
- 
-     if (text != NULL)
-         CommentPopUp(title, text);
 -    
+     if (moveNumber < 0 || parseList[moveNumber][0] == NULLCHAR) {
+       strcpy(title, "Comment");
+     } else {
+       sprintf(title, "Comment on %d.%s%s", moveNumber / 2 + 1,
+             WhiteOnMove(moveNumber) ? " " : ".. ",
+             parseList[moveNumber]);
+     }
+     // [HGM] PV info: display PV info together with (or as) comment
+     if(moveNumber >= 0 && (depth = pvInfoList[moveNumber].depth) > 0) {
+       if(text == NULL) text = "";                                           
+       score = pvInfoList[moveNumber].score;
+       sprintf(buf, "%s%.2f/%d %d\n%s", score>0 ? "+" : "", score/100.,
+             depth, (pvInfoList[moveNumber].time+50)/100, text);
+       text = buf;
+     }
+     if (text != NULL && (appData.autoDisplayComment || commentUp))
 -        CommentPopUp(title, text);
++      CommentPopUp(title, text);
  }
  
  /* This routine sends a ^C interrupt to gnuchess, to awaken it if it

diff --cc frontend.h
Simple merge

diff --cc xboard.c
Simple merge