Merge branch 'master' into next

diff --git a/src/config_parser.c b/src/config_parser.c
index f197c39d8a62274b900104e72765833185e04d43..bbd59a4572b08c47eedd6245e637708e9542ce7d 100644 (file)
--- a/src/config_parser.c
+++ b/src/config_parser.c
@@ -1070,7 +1070,7 @@ void parse_file(const char *f) {
         char *argv[] = {
             NULL, /* will be replaced by the executable path */
             "-f",
-            config.font.pattern,
+            (config.font.pattern ? config.font.pattern : "fixed"),
             "-t",
             (context->has_errors ? "error" : "warning"),
             "-m",