Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcd3d859 authored by Patrik Fimml's avatar Patrik Fimml Committed by Gerrit Code Review
Browse files

Merge "Don't override zsh users' compinit options."

parents c948d1a1 df248e60
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -1574,9 +1574,12 @@ function atest()
}

# Zsh needs bashcompinit called to support bash-style completion.
function add_zsh_completion() {
function enable_zsh_completion() {
    # Don't override user's options if bash-style completion is already enabled.
    if ! declare -f complete >/dev/null; then
        autoload -U compinit && compinit
        autoload -U bashcompinit && bashcompinit
    fi
}

function validate_current_shell() {
@@ -1587,7 +1590,7 @@ function validate_current_shell() {
            ;;
        *zsh*)
            function check_type() { type "$1"; }
            add_zsh_completion ;;
            enable_zsh_completion ;;
        *)
            echo -e "WARNING: Only bash and zsh are supported.\nUse of other shell would lead to erroneous results."
            ;;