refactor: rename variable { => _comp}_xspecs

Author: akinomyoga

bash_completion

@@ -2808,7 +2808,8 @@ complete -F _comp_longopt \
     sed seq shar sort split strip sum tac tail tee \
     texindex touch tr uname unexpand uniq units vdir wc who
 
-declare -Ag _xspecs
+# @since 2.12
+declare -Ag _comp_xspecs
 
 # TODO:API: rename per conventions
 _filedir_xspec()
@@ -2822,7 +2823,7 @@ _filedir_xspec()
     _comp_quote_compgen "$cur"
     local quoted=$ret
 
-    local xspec=${_xspecs[${1##*/}]} tmp
+    local xspec=${_comp_xspecs[${1##*/}]-${_xspecs[${1##*/}]-}} tmp
     local -a toks
     _comp_compgen -v toks -c "$quoted" -- -d
 
@@ -2855,7 +2856,7 @@ _comp__init_install_xspec()
     local xspec=$1 cmd
     shift
     for cmd in "$@"; do
-        _xspecs[$cmd]=$xspec
+        _comp_xspecs[$cmd]=$xspec
     done
 }
 # bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510
@@ -3038,7 +3039,7 @@ _comp_load()
     done
 
     # Look up simple "xspec" completions
-    [[ -v _xspecs[$cmdname] ]] &&
+    [[ -v _comp_xspecs[$cmdname] || -v _xspecs[$cmdname] ]] &&
         complete -F _filedir_xspec "$cmdname" "$backslash$cmdname" && return 0
 
     return 1

bash_completion.d/000_bash_completion_compat.bash

@@ -32,6 +32,9 @@ _comp_deprecate_func 2.12 _complete_as_root _comp_as_root
 _comp_deprecate_func 2.12 _included_ssh_config_files _comp__included_ssh_config_files
 _comp_deprecate_func 2.12 __load_completion _comp_load
 
+# @deprecated 2.12 Use `_comp_xspecs`
+declare -Ag _xspecs
+
 # Backwards compatibility for compat completions that use have().
 # @deprecated 1.90 should no longer be used; generally not needed with
 #   dynamically loaded completions, and _comp_have_command is suitable for