Prepare for zsh-users/zsh@587cced

module/.autocomplete.compinit

@@ -1,6 +1,7 @@
 #!/bin/zsh
 zmodload -Fa zsh/files b:zf_rm
 zmodload -Fa zsh/parameter p:funcstack p:functions
+builtin autoload -Uz is-at-least
 
 typeset -gHa _autocomplete_compdef=()
 compdef() {
@@ -221,26 +222,28 @@ EOF
     return ret
   }
 
-  .autocomplete.patch _wanted
-  _wanted() {
-    if [[ $funcstack == *_parameters* ]] &&
-        zstyle -T ":completion:${curcontext}:parameters" verbose; then
-      local -a params=( $@[(re)-,-1] )
-      shift -p $#params
-      shift params
-      _description "$@[1,3]"
-      builtin compadd "$expl[@]" "$@[5,-1]" -D params -a params
-      local -a displays=()
-      local sep; zstyle -s ":completion:${curcontext}:parameters" list-separator sep ||
-        sep=--
-      local MATCH MBEGIN MEND
-      zformat -a displays " $sep " \
-        "${(@)params[@]:/(#m)*/${MATCH}:${${(kv)${(P)MATCH}}[1,COLUMNS]}}"
-      displays=( "${(@)displays[@]//(#m)[^[:print:]]##/${(q+)MATCH}}" )
-      displays=( "${(@)displays[@]:/(#m)*/$MATCH[1,COLUMNS]}" )
-      .autocomplete._wanted "$@" -d displays -a params
-    else
-      .autocomplete._wanted "$@"
-    fi
-  }
+  if ! is-at-least 5.8.1; then
+    .autocomplete.patch _wanted
+    _wanted() {
+      if [[ $funcstack == *_parameters* ]] &&
+          zstyle -T ":completion:${curcontext}:parameters" verbose; then
+        local -a params=( $@[(re)-,-1] )
+        shift -p $#params
+        shift params
+        _description "$@[1,3]"
+        builtin compadd "$expl[@]" "$@[5,-1]" -D params -a params
+        local -a displays=()
+        local sep; zstyle -s ":completion:${curcontext}:parameters" list-separator sep ||
+          sep=--
+        local MATCH MBEGIN MEND
+        zformat -a displays " $sep " \
+          "${(@)params[@]:/(#m)*/${MATCH}:${${(kv)${(P)MATCH}}[1,COLUMNS]}}"
+        displays=( "${(@)displays[@]//(#m)[^[:print:]]##/${(q+)MATCH}}" )
+        displays=( "${(@)displays[@]:/(#m)*/$MATCH[1,COLUMNS]}" )
+        .autocomplete._wanted "$@" -d displays -a params
+      else
+        .autocomplete._wanted "$@"
+      fi
+    }
+  fi
 }

module/.autocomplete.config

@@ -99,6 +99,7 @@ _autocomplete.config.all-matches-format() {
 zstyle ':completion:*:history-lines' format ''
 
 zstyle ':completion:*' auto-description '%d'
+zstyle ':completion:*:parameters' extra-verbose yes
 
 zstyle ':completion:*' insert-sections yes
 zstyle ':completion:*' separate-sections yes

widget/.autocomplete.complete-word.completion-widget

@@ -1,5 +1,5 @@
 #!/bin/zsh
-autoload -Uz .autocomplete.complete-word.post
+builtin autoload -Uz .autocomplete.complete-word.post
 
 local +h curcontext=${curcontext:-${WIDGET}:::}
 local +h -a comppostfuncs=( .autocomplete.complete-word.post "$comppostfuncs[@]" )