4 files changed, 4 insertions, 4 deletions
diff --git a/Completion/Builtins/_autoload b/Completion/Builtins/_autoload
index 238b79e95..81ded019a 100644
--- a/Completion/Builtins/_autoload
+++ b/Completion/Builtins/_autoload
@@ -6,5 +6,5 @@ if (( $words[(I)[-+]*w*] )); then
   _description files expl 'zwc file'
   _files "$expl[@]" -g '*.zwc'
 else
-  _wanted functions expl 'shell function' compadd - ${^fpath}/*(N:t)
+  _wanted functions expl 'shell function' compadd - ${^fpath}/*(:t)
 fi
diff --git a/Completion/Builtins/_cd b/Completion/Builtins/_cd
index 3abe26049..05d5e6f88 100644
--- a/Completion/Builtins/_cd
+++ b/Completion/Builtins/_cd
@@ -19,7 +19,7 @@ if [[ CURRENT -eq 3 ]]; then
   # cd old new: look for old in $PWD and see what can replace it
   local rep
   # Get possible completions using word in position 2
-  rep=(${~PWD/$words[2]/*}~$PWD(-/N))
+  rep=(${~PWD/$words[2]/*}~$PWD(-/))
   # Now remove all the common parts of $PWD and the completions from this
   rep=(${${rep#${PWD%%$words[2]*}}%${PWD#*$words[2]}})
   (( $#rep )) && _wanted -C replacement strings expl replacement compadd -a rep
diff --git a/Completion/Builtins/_compdef b/Completion/Builtins/_compdef
index 636004af2..ab7c30e92 100644
--- a/Completion/Builtins/_compdef
+++ b/Completion/Builtins/_compdef
@@ -33,7 +33,7 @@ case $state in
     _wanted commands expl 'completed command' compadd -k _comps
   ;;
   cfun)
-    list=( ${^fpath:/.}/_(|*[^~])(N:t) )
+    list=( ${^fpath:/.}/_(|*[^~])(:t) )
     if zstyle -T ":completion:${curcontext}:functions" prefix-hidden; then
       disp=( ${list[@]#_} )
       _wanted functions expl 'completion function' \
diff --git a/Completion/Builtins/_popd b/Completion/Builtins/_popd
index ff9ede12e..f551bb299 100644
--- a/Completion/Builtins/_popd
+++ b/Completion/Builtins/_popd
@@ -5,7 +5,7 @@
 # way round if pushdminus is set). Note that this function is also called
 # from _cd for cd and pushd.
 
-setopt extendedglob nonomatch
+setopt localoptions nonomatch
 
 local expl list lines revlines disp