From 31cb3dda8d45dee9f62d9292ad8fc8882cc1e585 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 23 Oct 2011 16:41:23 +0100 Subject: [PATCH] cfgparse: use different literal strings for ambiguous keywords in bar context --- src/cfgparse.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"