Merge branch 'master' into next

[i3/i3] / testcases / t / 201-config-parser.t

diff --git a/testcases/t/201-config-parser.t b/testcases/t/201-config-parser.t
index 151103d7503d1f4770c46436445a66edc46de924..55239c62d749405f0a51bc8bf1515b7c4f2be3a0 100644 (file)
--- a/testcases/t/201-config-parser.t
+++ b/testcases/t/201-config-parser.t
@@ -627,7 +627,7 @@ EOT
 
 $expected = <<'EOT';
 cfg_bar_output(LVDS-1)
-ERROR: CONFIG: Expected one of these tokens: <end>, '#', 'set', 'i3bar_command', 'status_command', 'socket_path', 'mode', 'modifier', 'position', 'output', 'tray_output', 'font', 'workspace_buttons', 'verbose', 'colors', '}'
+ERROR: CONFIG: Expected one of these tokens: <end>, '#', 'set', 'i3bar_command', 'status_command', 'socket_path', 'mode', 'hidden_state', 'id', 'modifier', 'position', 'output', 'tray_output', 'font', 'binding_mode_indicator', 'workspace_buttons', 'verbose', 'colors', '}'
 ERROR: CONFIG: (in file <stdin>)
 ERROR: CONFIG: Line   1: bar {
 ERROR: CONFIG: Line   2:     output LVDS-1