about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-09-22 16:56:32 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-09-22 16:56:32 +0000
commit708999149bfcff2cef42c17d8d1c1ba0c6e38d32 (patch)
tree57e2d68ebcb2d91ee97d3fcc816885ec4a39c3a0
parent8dbf2a5bfa2de36f3ed0f18212d17d2a41595ff2 (diff)
downloadzsh-708999149bfcff2cef42c17d8d1c1ba0c6e38d32.tar.gz
zsh-708999149bfcff2cef42c17d8d1c1ba0c6e38d32.tar.xz
zsh-708999149bfcff2cef42c17d8d1c1ba0c6e38d32.zip
25710: various minor consistency tweaks for VCS_Info
-rw-r--r--ChangeLog9
-rw-r--r--Functions/VCS_Info/vcs_info4
-rw-r--r--Functions/VCS_Info/vcs_info_lastmsg3
-rw-r--r--Functions/VCS_Info/vcs_info_printsys10
-rw-r--r--Functions/VCS_Info/vcs_info_setsys4
5 files changed, 26 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index abec977b5..fd71a22d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-22  Peter Stephenson  <pws@csr.com>
+
+	* 25710: Functions/VCS_Info/vcs_info,
+	Functions/VCS_Info/vcs_info_lastmsg,
+	Functions/VCS_Info/vcs_info_printsys,
+	Functions/VCS_Info/vcs_info_setsys: use native zsh emulation;
+	make vcs_comm local in other functions; vcs_info_printsys
+	runs vcs_info_setsys if necessary.
+
 2008-09-22  Clint Adams  <clint@zsh.org>
 
 	* 25713: Functions/VCS_Info/vcs_info: ensure that vcs_info
diff --git a/Functions/VCS_Info/vcs_info b/Functions/VCS_Info/vcs_info
index 4a6c518f9..fb87e6a54 100644
--- a/Functions/VCS_Info/vcs_info
+++ b/Functions/VCS_Info/vcs_info
@@ -37,7 +37,9 @@ vcs_info_setsys
 
 # and now, finally create the real vcs_info function
 vcs_info () {
-    setopt localoptions noksharrays extendedglob
+    emulate -L zsh
+    setopt extendedglob
+
     local -i found
     local -a enabled disabled
     local -x usercontext vcs rrn
diff --git a/Functions/VCS_Info/vcs_info_lastmsg b/Functions/VCS_Info/vcs_info_lastmsg
index fe99d5999..fe33590e1 100644
--- a/Functions/VCS_Info/vcs_info_lastmsg
+++ b/Functions/VCS_Info/vcs_info_lastmsg
@@ -2,7 +2,8 @@
 ## Written by Frank Terbeck <ft@bewatermyfriend.org>
 ## Distributed under the same BSD-ish license as zsh itself.
 
-setopt localoptions NO_shwordsplit
+emulate -L zsh
+
 local -i i
 local -ix maxexports
 
diff --git a/Functions/VCS_Info/vcs_info_printsys b/Functions/VCS_Info/vcs_info_printsys
index d84682296..d457f09c5 100644
--- a/Functions/VCS_Info/vcs_info_printsys
+++ b/Functions/VCS_Info/vcs_info_printsys
@@ -2,13 +2,21 @@
 ## Written by Frank Terbeck <ft@bewatermyfriend.org>
 ## Distributed under the same BSD-ish license as zsh itself.
 
-setopt localoptions noksharrays extendedglob NO_shwordsplit
+emulate -L zsh
+setopt extendedglob
+
 local sys
 local -a disabled enabled
+local -Ax vcs_comm
 
 zstyle -a ":vcs_info:-init-:${1:-default}:-all-" "enable" enabled
 (( ${#enabled} == 0 )) && enabled=( all )
 
+if (( ${+VCS_INFO_backends} == 0 )); then
+  autoload -Uz vcs_info_setsys
+  vcs_info_setsys
+fi
+
 if [[ -n ${(M)enabled:#(#i)all} ]] ; then
     enabled=( ${VCS_INFO_backends} )
     zstyle -a ":vcs_info:-init-:${1:-default}:-all-" "disable" disabled
diff --git a/Functions/VCS_Info/vcs_info_setsys b/Functions/VCS_Info/vcs_info_setsys
index b3b78348d..42be13cf7 100644
--- a/Functions/VCS_Info/vcs_info_setsys
+++ b/Functions/VCS_Info/vcs_info_setsys
@@ -2,7 +2,9 @@
 ## Written by Frank Terbeck <ft@bewatermyfriend.org>
 ## Distributed under the same BSD-ish license as zsh itself.
 
-setopt localoptions noksharrays extendedglob typeset_silent NO_shwordsplit
+emulate -L zsh
+setopt extendedglob typeset_silent
+
 local sys
 typeset -g VCS_INFO_backends