From edfc7dfd9baf1b38dcb8dad931a958669c34250d Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <danielsh@apache.org>
Date: Fri, 28 Feb 2020 22:22:35 +0000
Subject: [PATCH] 'main': Fix issue #577.

---
 highlighters/main/main-highlighter.zsh        | 3 ++-
 highlighters/main/test-data/noglob-always.zsh | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 9a48222..590be77 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -744,7 +744,8 @@ _zsh_highlight_main_highlighter_highlight_list()
    elif ! (( in_redirection)) && [[ $this_word == *':always:'* && $arg == 'always' ]]; then
      # try-always construct
      style=reserved-word # de facto a reserved word, although not de jure
-     next_word=':start:' # only left brace is allowed, apparently
+     highlight_glob=true
+     next_word=':start::start_of_pipeline:' # only left brace is allowed, apparently
    elif ! (( in_redirection)) && [[ $this_word == *':start:'* ]]; then # $arg is the command word
      if (( ${+precommand_options[$arg]} )) && _zsh_highlight_main__is_runnable $arg; then
       style=precommand
diff --git a/highlighters/main/test-data/noglob-always.zsh b/highlighters/main/test-data/noglob-always.zsh
index f59e562..6d55048 100644
--- a/highlighters/main/test-data/noglob-always.zsh
+++ b/highlighters/main/test-data/noglob-always.zsh
@@ -40,8 +40,6 @@ expected_region_highlight=(
   '26 26 reserved-word' # {
   '28 31 builtin' # echo
   '33 33 default' # *
-  '33 33 globbing "issue #577"' # *
+  '33 33 globbing' # *
   '35 35 reserved-word' # }
 )
-
-expected_mismatch="expected default+globbing, observed default"