X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fconfig_parser.c;h=f197c39d8a62274b900104e72765833185e04d43;hb=7f5a18e093e8734e182bdb60f178324795e950f6;hp=7391896bf4ef391023b5e17834ead257085f92f7;hpb=fc0e80ee7f94c74a6b9097299870c80f18c8bfe7;p=i3%2Fi3

diff --git a/src/config_parser.c b/src/config_parser.c
index 7391896b..f197c39d 100644
--- a/src/config_parser.c
+++ b/src/config_parser.c
@@ -4,7 +4,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * config_parser.c: hand-written parser to parse configuration directives.
  *
@@ -446,6 +446,16 @@ struct ConfigResult *parse_config(const char *input, struct context *context) {
                 }
             }
 
+            if (strcmp(token->name, "line") == 0) {
+               while (*walk != '\0' && *walk != '\n' && *walk != '\r')
+                  walk++;
+               next_state(token);
+               token_handled = true;
+               linecnt++;
+               walk++;
+               break;
+            }
+
             if (strcmp(token->name, "end") == 0) {
                 //printf("checking for end: *%s*\n", walk);
                 if (*walk == '\0' || *walk == '\n' || *walk == '\r') {
@@ -1059,6 +1069,8 @@ void parse_file(const char *f) {
         sasprintf(&pageraction, "i3-sensible-pager \"%s\"\n", errorfilename);
         char *argv[] = {
             NULL, /* will be replaced by the executable path */
+            "-f",
+            config.font.pattern,
             "-t",
             (context->has_errors ? "error" : "warning"),
             "-m",