delegate_completion() {
local prog programs
prog=$1
- if has_completion $prog; then
- shift
- programs="$@"
- eval "_${prog}_completion_loader() {
- _completion_loader $prog
- complete -o nospace -F _$prog $programs
- unset _${prog}_completion_loader
- return 124
- }"
- complete -F _${prog}_completion_loader $programs
- fi
+ ! has_completion $prog && return
+ shift
+ programs="$@"
+ eval "_${prog}_completion_loader() {
+ _completion_loader $prog
+ complete -o nospace -F _$prog $programs
+ unset _${prog}_completion_loader
+ return 124
+ }"
+ complete -F _${prog}_completion_loader $programs
}
delegate_completion make m
if test -n "$BASH_VERSION"; then
MC_SAVE_OPS1="$OPS1"
if [ "`type -t short_curdir`" = function ]; then
- OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
- OPS1+="\$(prompt_git)\\$\$SHLVL "
+ OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
+ if test -x /usr/bin/git >/dev/null 2>&1; then
+ if [ "`type -t __git_ps1`" = function ]; then
+ OPS1+="\$(__git_ps1)"
+ else
+ OPS1+="\$(prompt_git)"
+ fi
+ fi
+ OPS1+=" \\$\$SHLVL "
else
OPS1="\u@\h:\W \\$"
fi