diff options
| author |   Aaron Walker <ka0ttic@gentoo.org> | 2005-03-28 12:37:21 +0000 |
|---|---|---|
| committer | Aaron Walker <ka0ttic@gentoo.org> | 2005-03-28 12:37:21 +0000 |
| commit | 02ed99bedc1a3a9f38e9e89a2119f4338217db42 (patch) | |
| tree | 5d086f93cd5704ff4cddcd3f528366eea4460c1e /app-shells/bash-completion/files | |
| parent | add www-proxy/squid:customlog (diff) | |
| download | gentoo-2-02ed99bedc1a3a9f38e9e89a2119f4338217db42.tar.gz gentoo-2-02ed99bedc1a3a9f38e9e89a2119f4338217db42.tar.bz2 gentoo-2-02ed99bedc1a3a9f38e9e89a2119f4338217db42.zip | |
Revision bump; extend mutt completion to also work with muttng. Thanks to Marcin 'aye' Kryczek <aye@gentoo.pl> in bug 86853 for the patch.
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-shells/bash-completion/files')
| -rw-r--r-- | app-shells/bash-completion/files/20050121-muttng.diff | 69 | ||||
| -rw-r--r-- | app-shells/bash-completion/files/digest-bash-completion-20050121-r4 | 1 |
2 files changed, 70 insertions, 0 deletions
diff --git a/app-shells/bash-completion/files/20050121-muttng.diff b/app-shells/bash-completion/files/20050121-muttng.diff new file mode 100644 index 000000000000..04f06ace04f8 --- /dev/null +++ b/app-shells/bash-completion/files/20050121-muttng.diff @@ -0,0 +1,69 @@ +--- bash_completion.orig 2005-03-27 23:40:42.000000000 -0500 ++++ bash_completion 2005-03-27 23:42:50.000000000 -0500 +@@ -4544,7 +4544,7 @@ + # + # 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 mutt || have muttng && { + _muttaddr() + { + _muttaliases +@@ -4577,9 +4577,10 @@ + local -a conffiles aliases + cur=${COMP_WORDS[COMP_CWORD]} + +- [ -f ~/.mutt/muttrc ] && muttrc="~/.mutt/muttrc" +- [ -f ~/.muttrc ] && muttrc="~/.muttrc" ++ [ -f ~/.${muttcmd}/${muttcmd}rc ] && muttrc="~/.${muttcmd}/${muttcmd}rc" ++ [ -f ~/.${muttcmd}rc ] && muttrc="~/.${muttcmd}rc" + [ -z "$muttrc" ] && return 0 ++ + conffiles=( $(eval _muttconffiles $muttrc $muttrc) ) + aliases=( $( sed -rn 's|^alias[[:space:]]+([^[:space:]]+).*$|\1|p' \ + $(eval echo ${conffiles[@]}) ) ) +@@ -4594,7 +4595,7 @@ + local -a queryresults + cur=${COMP_WORDS[COMP_CWORD]} + +- querycmd="$( mutt -Q query_command | sed -r 's|^query_command=\"(.*)\"$|\1|; s|%s|'$cur'|' )" ++ querycmd="$( $muttcmd -Q query_command | sed -r 's|^query_command=\"(.*)\"$|\1|; s|%s|'$cur'|' )" + if [ -z "$cur" -o -z "$querycmd" ]; then + queryresults=() + else +@@ -4616,7 +4617,7 @@ + # This is currently not working so well. Perhaps this function should + # just call _filedir() for the moment. + if [[ $cur == [=+]* ]]; then +- folder="$( mutt -Q folder | sed -r 's|^folder=\"(.*)\"$|\1|' )" ++ folder="$( $muttcmd -Q folder | sed -r 's|^folder=\"(.*)\"$|\1|' )" + : folder:=~/Mail + + # Match any file in $folder beginning with $cur +@@ -4625,7 +4626,7 @@ + COMPREPLY=( ${COMPREPLY[@]#$folder/} ) + return 0 + elif [ "$cur" == !* ]; then +- spoolfile="$( mutt -Q spoolfile | sed -r 's|^spoolfile=\"(.*)\"$|\1|' )" ++ spoolfile="$( $muttcmd -Q spoolfile | sed -r 's|^spoolfile=\"(.*)\"$|\1|' )" + [ ! -z "$spoolfile" ] && eval cur="${cur/^!/$spoolfile}"; + fi + _filedir +@@ -4640,6 +4641,8 @@ + prev=${COMP_WORDS[COMP_CWORD-1]} + + COMPREPLY=() ++ ++ [ ${COMP_WORDS[0]} == muttng ] && muttcmd="muttng" || muttcmd="mutt" + + case "$cur" in + -*) +@@ -4670,7 +4673,7 @@ + esac + + } +-complete -F _mutt $default $filenames mutt ++complete -F _mutt $default $filenames mutt muttng + } + + _configure_func() diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050121-r4 b/app-shells/bash-completion/files/digest-bash-completion-20050121-r4 new file mode 100644 index 000000000000..5b0dcdfbb97e --- /dev/null +++ b/app-shells/bash-completion/files/digest-bash-completion-20050121-r4 @@ -0,0 +1 @@ +MD5 fafeed562b01a8dee079eb851579f2d2 bash-completion-20050121.tar.bz2 90140 |