Merge tag '0.78', for real this time.

Oops. The previous merge came from a version of the release tag we
ended up not using. This one reflects what really went into the
release.

unix/dialog.c

@@ -2141,7 +2141,10 @@ GtkWidget *layout_ctrls(
           case CTRL_FONTSELECT: {
             GtkWidget *ww;
 
-            if (!ctrl->fileselect.just_button) {
+            bool just_button = (ctrl->type == CTRL_FILESELECT &&
+                                ctrl->fileselect.just_button);
+
+            if (!just_button) {
                 const char *browsebtn =
                     (ctrl->type == CTRL_FILESELECT ?
                      "Browse..." : "Change...");