From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 23 Oct 2011 15:41:23 +0000 (+0100)
Subject: cfgparse: use different literal strings for ambiguous keywords in bar context
X-Git-Tag: 4.1~73
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=31cb3dda8d45dee9f62d9292ad8fc8882cc1e585;p=i3%2Fi3

cfgparse: use different literal strings for ambiguous keywords in bar context
---

diff --git a/src/cfgparse.y b/src/cfgparse.y
index 178434d1..2d8bdba3 100644
--- a/src/cfgparse.y
+++ b/src/cfgparse.y
@@ -693,14 +693,14 @@ void parse_file(const char *f) {
 %token                  TOK_BAR_OUTPUT              "output (bar)"
 %token                  TOK_BAR_TRAY_OUTPUT         "tray_output"
 %token                  TOK_BAR_SOCKET_PATH         "socket_path"
-%token                  TOK_BAR_MODE                "mode"
+%token                  TOK_BAR_MODE                "mode (bar)"
 %token                  TOK_BAR_HIDE                "hide"
 %token                  TOK_BAR_DOCK                "dock"
 %token                  TOK_BAR_POSITION            "position"
 %token                  TOK_BAR_BOTTOM              "bottom"
 %token                  TOK_BAR_TOP                 "top"
 %token                  TOK_BAR_STATUS_COMMAND      "status_command"
-%token                  TOK_BAR_FONT                "font"
+%token                  TOK_BAR_FONT                "font (bar)"
 %token                  TOK_BAR_WORKSPACE_BUTTONS   "workspace_buttons"
 %token                  TOK_BAR_VERBOSE             "verbose"
 %token                  TOK_BAR_COLORS              "colors"