about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Completion/Unix/Command/_chmod2
-rw-r--r--Completion/Unix/Command/_chown2
-rw-r--r--Completion/Unix/Command/_cvs2
-rw-r--r--Completion/Unix/Type/_list_files2
-rw-r--r--Completion/Zsh/Type/_file_descriptors2
6 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ee6bc97e..facc1c944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-03  Peter Stephenson  <pws@csr.com>
+
+	* 25131: Completion/Unix/Command/_chmod,
+	Completion/Unix/Command/_chown, Completion/Unix/Command/_cvs,
+	Completion/Unix/Type/_list_files,
+	Completion/Zsh/Type/_file_descriptors: need b:zstat to
+	get zstat with zmodload -F zsh/stat.
+
 2008-06-02  Peter Stephenson  <pws@csr.com>
 
 	* users/12858: Doc/Zsh/compsys.yo: this bit didn't
diff --git a/Completion/Unix/Command/_chmod b/Completion/Unix/Command/_chmod
index 84013d591..6cb310d57 100644
--- a/Completion/Unix/Command/_chmod
+++ b/Completion/Unix/Command/_chmod
@@ -54,7 +54,7 @@ case "$state" in
   ;;
   files)
     if [[ -n $opt_args[--reference] ]]; then
-      zmodload -F zsh/stat zstat 2>/dev/null
+      zmodload -F zsh/stat b:zstat 2>/dev/null
       typeset -i8 ref=$(zstat +mode $opt_args[--reference])
       _wanted files expl file _files -g "*(-.^f${ref#??})" && ret=0
     elif [[ $words[2] = [0-7]## ]]; then
diff --git a/Completion/Unix/Command/_chown b/Completion/Unix/Command/_chown
index 9246db42c..b4539315d 100644
--- a/Completion/Unix/Command/_chown
+++ b/Completion/Unix/Command/_chown
@@ -50,7 +50,7 @@ case $state in
   files)
     (( $+opt_args[-h] || $+opt_args[--no-dereference] )) || deref="-"
     if (( $+opt_args[--reference] )); then
-      zmodload -F zsh/stat zstat 2>/dev/null
+      zmodload -F zsh/stat b:zstat 2>/dev/null
       usr=$(zstat +uid $opt_args[--reference])
       grp=$(zstat +gid $opt_args[--reference])
       _wanted files expl file _files -g "*($deref^u$usr,$deref^g$grp)" && ret=0
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs
index 01edbd30e..9b8eb0c4e 100644
--- a/Completion/Unix/Command/_cvs
+++ b/Completion/Unix/Command/_cvs
@@ -561,7 +561,7 @@ _cvs_watchers() {
 _cvs_loadstat() {
   (( $+_cvs_loadstat_status )) && return $_cvs_loadstat_status
 
-  zmodload -F zsh/stat zstat 2>/dev/null
+  zmodload -F zsh/stat b:zstat 2>/dev/null
   (( _cvs_loadstat_status = ! $+builtins[zstat] ))
   return $_cvs_loadstat_status
 }
diff --git a/Completion/Unix/Type/_list_files b/Completion/Unix/Type/_list_files
index bcb42907d..e04392d1d 100644
--- a/Completion/Unix/Type/_list_files
+++ b/Completion/Unix/Type/_list_files
@@ -46,7 +46,7 @@ done
 
 (( ok )) || return 1
 
-zmodload -F zsh/stat zstat 2>/dev/null || return 1
+zmodload -F zsh/stat b:zstat 2>/dev/null || return 1
 
 dir=${2:+$2/}
 dir=${(Q)dir}
diff --git a/Completion/Zsh/Type/_file_descriptors b/Completion/Zsh/Type/_file_descriptors
index 82d19d62a..29d907940 100644
--- a/Completion/Zsh/Type/_file_descriptors
+++ b/Completion/Zsh/Type/_file_descriptors
@@ -7,7 +7,7 @@ for i in {0..9}; [[ -e /dev/fd/$i ]] && fds+=( $i )
 if zstyle -T ":completion:${curcontext}:" verbose && [[ -e /proc/$$/fd ]]; then
   zstyle -s ":completion:${curcontext}:" list-separator sep || sep=--
 
-  if zmodload -F zsh/stat zstat; then
+  if zmodload -F zsh/stat b:zstat; then
     for i in "${fds[@]}"; do
       zstat +link -A link /proc/$$/fd/$i
       list+=( "$i $sep ${link[1]}" )