about summary refs log tree commit diff
path: root/Functions/VCS_Info/vcs_info
diff options
context:
space:
mode:
authorFrank Terbeck <bewater@users.sourceforge.net>2011-03-30 21:24:42 +0000
committerFrank Terbeck <bewater@users.sourceforge.net>2011-03-30 21:24:42 +0000
commiteb46727d3a03f2282e811664eee68c7e581c3277 (patch)
treecff95cb958d10b22caad53d5f7c762a8d8578a61 /Functions/VCS_Info/vcs_info
parent7c50fa1262bd106a923f8b7be85d8f23afc4ecc7 (diff)
downloadzsh-eb46727d3a03f2282e811664eee68c7e581c3277.tar.gz
zsh-eb46727d3a03f2282e811664eee68c7e581c3277.tar.xz
zsh-eb46727d3a03f2282e811664eee68c7e581c3277.zip
28959: Make the nvcsformats style be used if vcs_info is disabled.
Diffstat (limited to 'Functions/VCS_Info/vcs_info')
-rw-r--r--Functions/VCS_Info/vcs_info5
1 files changed, 3 insertions, 2 deletions
diff --git a/Functions/VCS_Info/vcs_info b/Functions/VCS_Info/vcs_info
index 385a451da..513489b70 100644
--- a/Functions/VCS_Info/vcs_info
+++ b/Functions/VCS_Info/vcs_info
@@ -37,6 +37,7 @@ for func in ${static_functions} ; do
     autoload -Uz ${func}
 done
 
+[[ -n ${(Mk)parameters:#vcs_info_msg_<->_} ]] && unset ${parameters[(I)vcs_info_msg_<->_]}
 VCS_INFO_set --nvcs '-preinit-'
 vcs_info_setsys
 
@@ -77,7 +78,7 @@ vcs_info () {
     (( ${#enabled} == 0 )) && enabled=( all )
 
     if [[ -n ${(M)enabled:#(#i)none} ]] ; then
-        [[ -n ${vcs_info_msg_0_} ]] && VCS_INFO_set --clear
+        [[ -n ${vcs_info_msg_0_} ]] && VCS_INFO_set --nvcs
         return 0
     fi
 
@@ -90,7 +91,7 @@ vcs_info () {
 
     for pat in ${dps} ; do
         if [[ ${PWD} == ${~pat} ]] ; then
-            [[ -n ${vcs_info_msg_0_} ]] && VCS_INFO_set --clear
+            [[ -n ${vcs_info_msg_0_} ]] && VCS_INFO_set --nvcs
             return 0
         fi
     done