Skip to content

Commit be90a55

Browse files
committed
refactor: rename { => _comp_complete}_minimal
1 parent 9951738 commit be90a55

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

bash_completion

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2679,7 +2679,7 @@ _comp_command_offset()
26792679
if ((${#COMPREPLY[@]} == 0)); then
26802680
# XXX will probably never happen as long as completion loader loads
26812681
# *something* for every command thrown at it ($cspec != empty)
2682-
_minimal "${args[@]}"
2682+
_comp_complete_minimal "${args[@]}"
26832683
fi
26842684
elif [[ $cspec == *' -F '* ]]; then
26852685
# complete -F <function>
@@ -2958,15 +2958,15 @@ unset -f _comp__init_install_xspec
29582958
29592959
# Minimal completion to use as fallback in _comp_complete_load.
29602960
# TODO:API: rename per conventions
2961-
_minimal()
2961+
_comp_complete_minimal()
29622962
{
29632963
local cur prev words cword comp_args
29642964
_comp_initialize -- "$@" || return
29652965
compopt -o bashdefault -o default
29662966
}
29672967
# Complete the empty string to allow completion of '>', '>>', and '<' on < 4.3
29682968
# https://lists.gnu.org/archive/html/bug-bash/2012-01/msg00045.html
2969-
complete -F _minimal ''
2969+
complete -F _comp_complete_minimal ''
29702970
29712971
# @since 2.12
29722972
_comp_load()
@@ -3094,7 +3094,7 @@ _comp_load()
30943094
complete -F _comp_complete_filedir_xspec "$cmdname" "$backslash$cmdname" && return 0
30953095
30963096
if [[ $flag_fallback_default ]]; then
3097-
complete -F _minimal -- "$origcmd" && return 0
3097+
complete -F _comp_complete_minimal -- "$origcmd" && return 0
30983098
fi
30993099
31003100
return 1

bash_completion.d/000_bash_completion_compat.bash

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,14 @@ _comp_deprecate_func 2.12 _installed_modules _comp_compgen_inserted_kernel_modul
2828
_comp_deprecate_func 2.12 _usergroup _comp_compgen_usergroups
2929
_comp_deprecate_func 2.12 _complete_as_root _comp_as_root
3030
_comp_deprecate_func 2.12 __load_completion _comp_load
31+
32+
# completers
3133
_comp_deprecate_func 2.12 _service _comp_complete_service
3234
_comp_deprecate_func 2.12 _user_at_host _comp_complete_user_at_host
3335
_comp_deprecate_func 2.12 _known_hosts _comp_complete_known_hosts
3436
_comp_deprecate_func 2.12 _longopt _comp_complete_longopt
3537
_comp_deprecate_func 2.12 _filedir_xspec _comp_complete_filedir_xspec
38+
_comp_deprecate_func 2.12 _minimal _comp_complete_minimal
3639

3740
# @deprecated 2.12 Use `_comp_xspecs`
3841
declare -Ag _xspecs

completions/gcc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ _comp_cmd_gcc()
6565
"$1" --version 2>/dev/null | command grep -q GCC; then
6666
complete -F _comp_cmd_gcc "$1"
6767
else
68-
complete -F _minimal "$1"
68+
complete -F _comp_complete_minimal "$1"
6969
fi
7070
} &&
7171
_comp_cmd_gcc__setup_cmd cc gcc &&

completions/makepkg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ _comp_cmd_makepkg__bootstrap()
3333
fname=_comp_cmd_makepkg__slackware
3434
;;
3535
*)
36-
fname=_minimal
36+
fname=_comp_complete_minimal
3737
;;
3838
esac
3939

0 commit comments

Comments
 (0)