Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-06-29 23:47:29 +02:00
commit 6241419c86
1 changed files with 1 additions and 1 deletions

View File

@ -1070,7 +1070,7 @@ void parse_file(const char *f) {
char *argv[] = { char *argv[] = {
NULL, /* will be replaced by the executable path */ NULL, /* will be replaced by the executable path */
"-f", "-f",
config.font.pattern, (config.font.pattern ? config.font.pattern : "fixed"),
"-t", "-t",
(context->has_errors ? "error" : "warning"), (context->has_errors ? "error" : "warning"),
"-m", "-m",