diff options
Diffstat (limited to 'completions/mutt')
| -rw-r--r-- | completions/mutt | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/completions/mutt b/completions/mutt index 3dc82a92..568479ec 100644 --- a/completions/mutt +++ b/completions/mutt @@ -10,8 +10,6 @@ _muttaddr() _muttquery "$1" COMPREPLY+=( $( compgen -u -- "$1" ) ) - - return 0 } @@ -57,7 +55,7 @@ _muttconffiles() sofar=" $1 " shift while [[ "$1" ]]; do - newconffiles=( $(sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' $(eval printf %s $1) ) ) + newconffiles=( $(command sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' $(eval printf %s $1) ) ) for file in "${newconffiles[@]}"; do __expand_tilde_by_ref file [[ ! -f "$file" || $sofar == *\ $file\ * ]] && continue @@ -77,14 +75,12 @@ _muttaliases() local -a conffiles aliases muttrc=$(_muttrc) - [[ -z $muttrc ]] && return 0 + [[ -z $muttrc ]] && return conffiles=( $(eval _muttconffiles $muttrc $muttrc) ) - aliases=( $( sed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \ + aliases=( $( command sed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \ $(eval echo "${conffiles[@]}") ) ) COMPREPLY+=( $( compgen -W "${aliases[*]}" -- "$cur" ) ) - - return 0 } @@ -94,18 +90,16 @@ _muttquery() local cur=$1 querycmd muttcmd=${words[0]} local -a queryresults - querycmd="$( $muttcmd -Q query_command 2>/dev/null | sed -e 's|^query_command=\"\(.*\)\"$|\1|' -e 's|%s|'$cur'|' )" + querycmd="$( $muttcmd -Q query_command 2>/dev/null | command sed -e 's|^query_command=\"\(.*\)\"$|\1|' -e 's|%s|'$cur'|' )" if [[ -z "$cur" || -z "$querycmd" ]]; then queryresults=() else __expand_tilde_by_ref querycmd queryresults=( $( $querycmd | \ - sed -n '2,$s|^\([^[:space:]]\{1,\}\).*|\1|p' ) ) + command sed -n '2,$s|^\([^[:space:]]\{1,\}\).*|\1|p' ) ) fi COMPREPLY+=( $( compgen -W "${queryresults[*]}" -- "$cur" ) ) - - return 0 } @@ -116,7 +110,7 @@ _muttfiledir() muttrc=$(_muttrc) if [[ $cur == [=+]* ]]; then - folder="$( $muttcmd -F "$muttrc" -Q folder 2>/dev/null | sed -e 's|^folder=\"\(.*\)\"$|\1|' )" + folder="$( $muttcmd -F "$muttrc" -Q folder 2>/dev/null | command sed -e 's|^folder=\"\(.*\)\"$|\1|' )" : folder:=~/Mail # Match any file in $folder beginning with $cur @@ -124,15 +118,13 @@ _muttfiledir() compopt -o filenames COMPREPLY=( $( compgen -f -- "$folder/${cur:1}" ) ) COMPREPLY=( ${COMPREPLY[@]#$folder/} ) - return 0 + return elif [[ $cur == !* ]]; then spoolfile="$( $muttcmd -F "$muttrc" -Q spoolfile 2>/dev/null | \ - sed -e 's|^spoolfile=\"\(.*\)\"$|\1|' )" + command sed -e 's|^spoolfile=\"\(.*\)\"$|\1|' )" [[ ! -z $spoolfile ]] && eval cur="${cur/^!/$spoolfile}" fi _filedir - - return 0 } @@ -145,24 +137,24 @@ _mutt() -*) COMPREPLY=( $( compgen -W '-A -a -b -c -e -f -F -H -i -m -n -p -Q -R -s -v -x -y -z -Z -h' -- "$cur" ) ) - return 0 + return ;; *) case $prev in -a|-f|-F|-H|-i) _muttfiledir "$cur" - return 0 + return ;; -A) _muttaliases "$cur" - return 0 + return ;; -e|-m|-Q|-s|-h|-p|-R|-v|-y|-z|-Z) - return 0 + return ;; *) _muttaddr "$cur" - return 0 + return ;; esac ;; @@ -170,4 +162,4 @@ _mutt() } && complete -F _mutt -o default mutt muttng -# ex: ts=4 sw=4 et filetype=sh +# ex: filetype=sh |