Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-06-29 23:47:29 +02:00
commit 6241419c86

View File

@ -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",