Skip to content

Commit d23c9a8

Browse files
committed
refactor: rename { => _comp_complete}_minimal
1 parent dccf20f commit d23c9a8

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
@@ -2670,7 +2670,7 @@ _comp_command_offset()
26702670
if ((${#COMPREPLY[@]} == 0)); then
26712671
# XXX will probably never happen as long as completion loader loads
26722672
# *something* for every command thrown at it ($cspec != empty)
2673-
_minimal "${args[@]}"
2673+
_comp_complete_minimal "${args[@]}"
26742674
fi
26752675
elif [[ $cspec == *' -F '* ]]; then
26762676
# complete -F <function>
@@ -2949,15 +2949,15 @@ unset -f _install_xspec
29492949
29502950
# Minimal completion to use as fallback in _completion_loader.
29512951
# TODO:API: rename per conventions
2952-
_minimal()
2952+
_comp_complete_minimal()
29532953
{
29542954
local cur prev words cword comp_args
29552955
_comp_initialize -- "$@" || return
29562956
compopt -o bashdefault -o default
29572957
}
29582958
# Complete the empty string to allow completion of '>', '>>', and '<' on < 4.3
29592959
# https://lists.gnu.org/archive/html/bug-bash/2012-01/msg00045.html
2960-
complete -F _minimal ''
2960+
complete -F _comp_complete_minimal ''
29612961
29622962
# TODO:API: rename per conventions
29632963
__load_completion()
@@ -3084,7 +3084,7 @@ _completion_loader()
30843084
__load_completion "$cmd" && return 124
30853085
30863086
# Need to define *something*, otherwise there will be no completion at all.
3087-
complete -F _minimal -- "$cmd" && return 124
3087+
complete -F _comp_complete_minimal -- "$cmd" && return 124
30883088
} &&
30893089
complete -D -F _completion_loader
30903090

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 _modules _comp_compgen_kernel_modules
2828
_comp_deprecate_func 2.12 _installed_modules _comp_compgen_inserted_kernel_modules
2929
_comp_deprecate_func 2.12 _usergroup _comp_compgen_usergroup
3030
_comp_deprecate_func 2.12 _complete_as_root _comp_as_root
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
# Backwards compatibility for compat completions that use have().
3841
# @deprecated 1.90 should no longer be used; generally not needed with

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)