Merge branch 'master' into next

2013-06-29 23:47:29 +02:00 · 2013-06-29 23:47:29 +02:00 · 6241419c86
parent f55b7977e8 8a7a80e22e
commit 6241419c86
1 changed files with 1 additions and 1 deletions
--- 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",