From b3f66fc8748f75e8f153a68d929fe2f6880f061a Mon Sep 17 00:00:00 2001
From: Matthew Martin <phy1729@gmail.com>
Date: Mon, 22 Oct 2018 17:14:48 -0500
Subject: [PATCH] main: Use zsyh_user_options when splitting alias RHS

---
 highlighters/main/main-highlighter.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index f4a0cc8..b0c5c92 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -543,8 +543,11 @@ _zsh_highlight_main_highlighter_highlight_list()
         _zsh_highlight_main__resolve_alias $arg
         local -a alias_args
         # Elision is desired in case alias x=''
-        alias_args=( ${interactive_comments-${(z)REPLY}}
-                     ${interactive_comments+${(zZ+c+)REPLY}} )
+        if [[ $zsyh_user_options[interactivecomments] == on ]]; then
+          alias_args=(${(zZ+c+)REPLY})
+        else
+          alias_args=(${(z)REPLY})
+        fi
         args=( $alias_args $args )
         if (( in_alias == 0 )); then
           _zsh_highlight_main_add_region_highlight $start_pos $end_pos alias