Merge branch 'master' into xcircuit-3.10

RTimothyEdwards · Sep 20, 2020 · adc6bf9 · adc6bf9
2 parents eb4fc5a + fcee698
commit adc6bf9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.10.28
+3.10.29
diff --git a/tclxcircuit.c b/tclxcircuit.c
@@ -9856,6 +9856,11 @@ void build_app_database(Tk_Window tkwind)
       appdata.filefont = XLoadQueryFont(dpy, "-*-*-medium-r-normal--14-*");
       if (appdata.filefont == NULL)
 	 appdata.filefont = XLoadQueryFont(dpy, "-*-*-*-*-*--*-*");
+	 if (appdata.filefont == NULL)
+	    appdata.filefont = XLoadQueryFont(dpy, "*");
+	    if (appdata.filefont == NULL) {
+	       Fprintf(stderr, "Fatal error:  No X11 fonts found.\n");
+	    }
    }
 
    /* Other defaults */