Merge branch 'master' into next

diff --combined src/cfgparse.y
index dbe227ddffd1b2bcce745d1c04cd8a2efc878e74,073ff241400b1aaa2cc071529abb21be5eb22d7c..71727c978ae2b722be81fda0170953a62b677fff
--- 1/src/cfgparse.y
--- 2/src/cfgparse.y
+++ b/src/cfgparse.y
@@@ -479,6 -479,8 +479,8 @@@ void parse_file(const char *f) 
                  v_value = strstr(value, "\t");
  
              *(v_value++) = '\0';
+             while (*v_value == '\t' || *v_value == ' ')
+                 v_value++;
  
              struct Variable *new = scalloc(sizeof(struct Variable));
              new->key = sstrdup(v_key);
@@@ -710,7 -712,6 +712,7 @@@
  %token                  TOK_BAR_BOTTOM              "bottom"
  %token                  TOK_BAR_TOP                 "top"
  %token                  TOK_BAR_STATUS_COMMAND      "status_command"
 +%token                  TOK_BAR_I3BAR_COMMAND       "i3bar_command"
  %token                  TOK_BAR_FONT                "font (bar)"
  %token                  TOK_BAR_WORKSPACE_BUTTONS   "workspace_buttons"
  %token                  TOK_BAR_VERBOSE             "verbose"
@@@ -1035,7 -1036,6 +1037,7 @@@ barlines
  barline:
      comment
      | bar_status_command
 +    | bar_i3bar_command
      | bar_output
      | bar_tray_output
      | bar_position
@@@ -1062,15 -1062,6 +1064,15 @@@ bar_status_command
      }
      ;
  
 +bar_i3bar_command:
 +    TOK_BAR_I3BAR_COMMAND STR
 +    {
 +        DLOG("should add i3bar_command %s\n", $2);
 +        FREE(current_bar.i3bar_command);
 +        current_bar.i3bar_command = $2;
 +    }
 +    ;
 +
  bar_output:
      TOK_BAR_OUTPUT STR
      {
@@@ -1562,7 -1553,6 +1564,7 @@@ font
      TOKFONT STR
      {
          config.font = load_font($2, true);
 +        set_font(&config.font);
          printf("font %s\n", $2);
          FREE(font_pattern);
          font_pattern = $2;