- mutt completion improvements by Rodrigo Bernardo Pimentel <rbp@isnomore.net>

This commit is contained in:
ianmacd 2003-12-15 18:02:22 +00:00
parent 05725fd9f9
commit b36b354865

View File

@ -1,6 +1,6 @@
# bash_completion - some programmable completion functions for bash 2.05b # bash_completion - some programmable completion functions for bash 2.05b
# #
# $Id: bash_completion,v 1.664 2003/12/15 18:57:49 ianmacd Exp $ # $Id: bash_completion,v 1.665 2003/12/15 19:02:22 ianmacd Exp $
# #
# Copyright (C) Ian Macdonald <ian@caliban.org> # Copyright (C) Ian Macdonald <ian@caliban.org>
# #
@ -3728,18 +3728,37 @@ _muttaddr()
return 0 return 0
} }
_muttconffiles()
{
local file sofar
local -a newconffiles
sofar=" $1 "
shift
while [[ "$1" ]]; do
newconffiles=( $(sed -rn 's/^source[[:space:]]+([^[:space:]]+).*$/\1/p' $(eval echo $1) ) )
for file in ${newconffiles[@]}; do
[[ ! "$file" ]] || [[ "${sofar/ ${file} / }" != "$sofar" ]] &&
continue
sofar="$sofar $file"
sofar=" $(eval _muttconffiles \"$sofar\" $file) "
done
shift
done
echo $sofar
}
_muttaliases() _muttaliases()
{ {
local cur muttrc local cur muttrc
local -a aliases local -a conffiles aliases
cur=${COMP_WORDS[COMP_CWORD]} cur=${COMP_WORDS[COMP_CWORD]}
[ -f ~/.mutt/muttrc ] && muttrc="~/.mutt/muttrc" [ -f ~/.mutt/muttrc ] && muttrc="~/.mutt/muttrc"
[ -f ~/.muttrc ] && muttrc="~/.muttrc" [ -f ~/.muttrc ] && muttrc="~/.muttrc"
[ -z "$muttrc" ] && return 0 [ -z "$muttrc" ] && return 0
# TODO: this only checks for one level on sourced files conffiles=( $(eval _muttconffiles $muttrc $muttrc) )
conffiles=( $muttrc $(sed -rn 's/^source[[:space:]]+([^[:space:]]+).*$/\1/p' $(eval echo $muttrc)) ) aliases=( $( sed -rn 's/^alias[[:space:]]+([^[:space:]]+).*$/\1/p' \
aliases=( $( sed -rn 's/^alias[[:space:]]+([^[:space:]]+).*$/\1/p' $(eval echo ${conffiles[@]}) ) ) $(eval echo ${conffiles[@]}) ) )
COMPREPLY=( ${COMPREPLY[@]} $( compgen -W "${aliases[*]}" -- $cur ) ) COMPREPLY=( ${COMPREPLY[@]} $( compgen -W "${aliases[*]}" -- $cur ) )
return 0 return 0
@ -3755,10 +3774,12 @@ _muttquery()
if [ -z "$cur" -o -z "$querycmd" ]; then if [ -z "$cur" -o -z "$querycmd" ]; then
queryresults=() queryresults=()
else else
queryresults=( $( $querycmd | sed -nr '2,$s/^([^[:space:]]+).*/\1/p' ) ) queryresults=( $( $querycmd | \
sed -nr '2,$s/^([^[:space:]]+).*/\1/p' ) )
fi fi
COMPREPLY=( ${COMPREPLY[@]} $( compgen -W "${queryresults[*]}" -- $cur ) ) COMPREPLY=( ${COMPREPLY[@]} $( compgen -W "${queryresults[*]}" \
-- $cur ) )
return 0 return 0
} }
@ -3784,27 +3805,38 @@ _muttfiledir()
_mutt() _mutt()
{ {
local prev local cur prev
cur=${COMP_WORDS[COMP_CWORD]}
prev=${COMP_WORDS[COMP_CWORD-1]} prev=${COMP_WORDS[COMP_CWORD-1]}
COMPREPLY=() COMPREPLY=()
case "$prev" in case "$cur" in
-@(a|f|F|H|i)) -*)
_muttfiledir COMPREPLY=( $( compgen -W '-A -a -b -c -e -f -F -H -i -m -n \
return 0 -p -Q -R -s -v -x -y -z -Z -h' \
;; -- $cur ) )
-A)
_muttaliases
return 0
;;
-@(e|m|Q|s|h|p|R|v|y|z|Z))
return 0 return 0
;; ;;
*) *)
_muttaddr case "$prev" in
return 0 -@(a|f|F|H|i))
;; _muttfiledir
return 0
;;
-A)
_muttaliases
return 0
;;
-@(e|m|Q|s|h|p|R|v|y|z|Z))
return 0
;;
*)
_muttaddr
return 0
;;
esac
;;
esac esac
} }