diff options
Diffstat (limited to 'completions/mutt')
| -rw-r--r-- | completions/mutt | 60 |
1 files changed, 24 insertions, 36 deletions
diff --git a/completions/mutt b/completions/mutt index e5e9d289..70699a15 100644 --- a/completions/mutt +++ b/completions/mutt @@ -1,20 +1,18 @@ -# mutt completion +# mutt completion -*- shell-script -*- # # Mutt doesn't have an "addressbook" like Pine, but it has aliases and # a "query" function to retrieve addresses, so that's what we use here. -have mutt || have muttng && { - # @param $1 (cur) Current word to complete _muttaddr() { _muttaliases "$1" _muttquery "$1" - COMPREPLY=( "${COMPREPLY[@]}" $( compgen -u -- "$1" ) ) + COMPREPLY+=( $( compgen -u -- "$1" ) ) return 0 -} # _muttaddr() +} # Find muttrc to use @@ -22,7 +20,7 @@ _muttaddr() _muttrc() { # Search COMP_WORDS for '-F muttrc' or '-Fmuttrc' argument - set -- "${COMP_WORDS[@]}" + set -- "${words[@]}" while [ $# -gt 0 ]; do if [ "${1:0:2}" = -F ]; then if [ ${#1} -gt 2 ]; then @@ -44,7 +42,7 @@ _muttrc() fi fi printf "%s" "$muttrc" -} # _muttrc() +} # Recursively build list of sourced config files @@ -61,21 +59,22 @@ _muttconffiles() while [[ "$1" ]]; do newconffiles=( $(sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' $(eval echo $1) ) ) for file in "${newconffiles[@]}"; do + __expand_tilde_by_ref file [[ ! -f "$file" || "${sofar/ ${file} / }" != "$sofar" ]] && continue - sofar="$sofar $file" + sofar+=" $file" sofar=" $(eval _muttconffiles \"$sofar\" $file) " done shift done printf '%s\n' $sofar -} # _muttconffiles() +} # @param $1 (cur) Current word to complete _muttaliases() { - local cur=$1 muttrc muttcmd=${COMP_WORDS[0]} + local cur=$1 muttrc muttcmd=${words[0]} local -a conffiles aliases muttrc=$(_muttrc) @@ -84,7 +83,7 @@ _muttaliases() conffiles=( $(eval _muttconffiles $muttrc $muttrc) ) aliases=( $( sed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \ $(eval echo "${conffiles[@]}") ) ) - COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "${aliases[*]}" -- "$cur" ) ) + COMPREPLY+=( $( compgen -W "${aliases[*]}" -- "$cur" ) ) return 0 } @@ -93,19 +92,19 @@ _muttaliases() # @param $1 (cur) Current word to complete _muttquery() { - local cur=$1 querycmd muttcmd=${COMP_WORDS[0]} + local cur=$1 querycmd muttcmd=${words[0]} local -a queryresults - querycmd="$( $muttcmd -Q query_command | sed -e 's|^query_command=\"\(.*\)\"$|\1|' -e 's|%s|'$cur'|' )" + querycmd="$( $muttcmd -Q query_command 2>/dev/null | 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' ) ) fi - COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "${queryresults[*]}" \ - -- "$cur" ) ) + COMPREPLY+=( $( compgen -W "${queryresults[*]}" -- "$cur" ) ) return 0 } @@ -114,38 +113,34 @@ _muttquery() # @param $1 (cur) Current word to complete _muttfiledir() { - local cur=$1 folder muttrc spoolfile muttcmd=${COMP_WORDS[0]} + local cur=$1 folder muttrc spoolfile muttcmd=${words[0]} muttrc=$(_muttrc) if [[ $cur == [=+]* ]]; then - folder="$( $muttcmd -F "$muttrc" -Q folder | sed -e 's|^folder=\"\(.*\)\"$|\1|' )" + folder="$( $muttcmd -F "$muttrc" -Q folder 2>/dev/null | sed -e 's|^folder=\"\(.*\)\"$|\1|' )" : folder:=~/Mail # Match any file in $folder beginning with $cur # (minus the leading '=' sign). - _compopt_o_filenames + compopt -o filenames COMPREPLY=( $( compgen -f -- "$folder/${cur:1}" ) ) COMPREPLY=( ${COMPREPLY[@]#$folder/} ) return 0 elif [ "$cur" == !* ]; then - spoolfile="$( $muttcmd -F "$muttrc" -Q spoolfile | \ + spoolfile="$( $muttcmd -F "$muttrc" -Q spoolfile 2>/dev/null | \ sed -e 's|^spoolfile=\"\(.*\)\"$|\1|' )" - [ ! -z "$spoolfile" ] && eval cur="${cur/^!/$spoolfile}"; + [ ! -z "$spoolfile" ] && eval cur="${cur/^!/$spoolfile}" fi _filedir return 0 -} # _muttfiledir +} _mutt() { - local cur prev - _get_comp_words_by_ref -n =+! cur prev - #cur=`_get_cword =+!` - #prev=`_get_pword =+!` - - COMPREPLY=() + local cur prev words cword + _init_completion -n =+! || return case $cur in -*) @@ -173,14 +168,7 @@ _mutt() esac ;; esac -} # _mutt() +} && complete -F _mutt -o default mutt muttng -} # have mutt - -# Local variables: -# mode: shell-script -# sh-basic-offset: 4 -# sh-indent-comment: t -# indent-tabs-mode: nil -# End: + # ex: ts=4 sw=4 et filetype=sh |