Merge branch 'fix/zsh-DISABLED_VCS_PATH' into develop

Fixes #423
liquidprompt · Apr 1, 2016 · 0a1f155 · 0a1f155
2 parents 20c0461 + fd1951a
commit 0a1f155
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -46,6 +46,7 @@
 	    * Fix typo in git work directory detection
 	- Fossil:
 	    * Fix on darwin (GitHub #390)
+	- LP_DISABLED_VCS_PATH is fixed on zsh (GitHub #423)
 	- Battery indicator:
 	    * MacOS: many fixes to handle (all?) edge cases (GitHub #326)
 	      We now have a pmset simulator to better detect regressions.
@@ -99,7 +100,7 @@
 	(@Ozzyboshi), Roger Huang (@rhuang2014), Sebastian Bremicker
 	(@sebrem), Alex Prengere (@alexprengere), Philipp Grogg (@grog-gg),
 	Tener Hades (@tenerhades), Thomas Kühnel (@kuehnelth), Étienne Deparis
-	(@milouse)...
+	(@milouse), @Hotschke...
 	... for their patches or bug reports.
 
 1.9     2014-11-12  dolmen (Olivier Mengué)

diff --git a/liquidprompt b/liquidprompt
@@ -812,6 +812,7 @@ _lp_jobcount_color()
 _lp_are_vcs_enabled()
 {
     [[ -z "$LP_DISABLED_VCS_PATH" ]] && return 0
+    $_LP_SHELL_zsh && setopt local_options && setopt sh_word_split
     local path
     local IFS=:
     for path in $LP_DISABLED_VCS_PATH; do