Merge branch 'master' into next

diff --combined src/cfgparse.y
index cebd858782bbe052ea2a5e6ae2b3aec8960fd0c9,92a4d4594ec1763be887e9766a8fc3ebb2eff734..ec3dde0ba3b2c897cf8f2106ac37975144a5f284
--- 1/src/cfgparse.y
--- 2/src/cfgparse.y
+++ b/src/cfgparse.y
@@@ -103,7 -103,9 +103,9 @@@ static int detect_version(char *buf) 
                  strncasecmp(bind, "focus down", strlen("focus down")) == 0 ||
                  strncasecmp(bind, "border normal", strlen("border normal")) == 0 ||
                  strncasecmp(bind, "border 1pixel", strlen("border 1pixel")) == 0 ||
-                 strncasecmp(bind, "border borderless", strlen("border borderless")) == 0) {
+                 strncasecmp(bind, "border borderless", strlen("border borderless")) == 0 ||
+                 strncasecmp(bind, "--no-startup-id", strlen("--no-startup-id")) == 0 ||
+                 strncasecmp(bind, "bar", strlen("bar")) == 0) {
                  printf("deciding for version 4 due to this line: %.*s\n", (int)(walk-line), line);
                  return 4;
              }
@@@ -705,7 -707,6 +707,7 @@@ void parse_file(const char *f) 
  %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"
@@@ -1030,7 -1031,6 +1032,7 @@@ barlines
  barline:
      comment
      | bar_status_command
 +    | bar_i3bar_command
      | bar_output
      | bar_tray_output
      | bar_position
@@@ -1057,15 -1057,6 +1059,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
      {
@@@ -1557,7 -1548,6 +1559,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;