Merge remote-tracking branch 'origin/master' into obsd

1 files changed, 1 insertions, 6 deletions

diff --git a/src/util.c b/src/util.c
index e54eca8..986ff79 100644
--- a/src/util.c
+++ b/src/util.c
@@ -586,17 +586,13 @@ GetFont(MyFont *font)
     int ascent;
     int descent;
     int fnum;
-    char *basename2;
 
     if (use_fontset) {
 	if (font->fontset != NULL){
 	    XFreeFontSet(dpy, font->fontset);
 	}
 
-	asprintf(&basename2, "%s,*", font->name);
-	if (!basename2)
-	    basename2 = font->name;
-	if( (font->fontset = XCreateFontSet(dpy, basename2,
+	if( (font->fontset = XCreateFontSet(dpy, font->name,
 					    &missing_charset_list_return,
 					    &missing_charset_count_return,
 					    &def_string_return)) == NULL) {
@@ -604,7 +600,6 @@ GetFont(MyFont *font)
 			 ProgramName, font->name);
 	    exit(1);
 	}
-	if (basename2 != font->name) free(basename2);
 	for(i=0; i<missing_charset_count_return; i++){
 	    printf("%s: warning: font for charset %s is lacking.\n",
 		   ProgramName, missing_charset_list_return[i]);