diff options
Diffstat (limited to 'Completion')
| -rw-r--r-- | Completion/Base/_arguments | 4 | ||||
| -rw-r--r-- | Completion/Core/.distfiles | 8 | ||||
| -rw-r--r-- | Completion/User/_mailboxes | 6 | ||||
| -rw-r--r-- | Completion/User/_mutt | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments index 19288b7ca..258b56b3a 100644 --- a/Completion/Base/_arguments +++ b/Completion/Base/_arguments @@ -256,8 +256,8 @@ if (( $# )) && comparguments -i "$autod" "$@"; then if [[ -z "$matched$mesg" ]] && _requested options && { ! zstyle -t ":completion:${curcontext}:options" prefix-needed || - [[ ( "$origpre" = [-+]* || -z "$aret$mesg" ) && - nm -eq compstate[nmatches] ]] } ; then + [[ "$origpre" = [-+]* || + ( -z "$aret$mesg" && nm -eq compstate[nmatches] ) ]] } ; then local prevpre="$PREFIX" previpre="$IPREFIX" PREFIX="$origpre" diff --git a/Completion/Core/.distfiles b/Completion/Core/.distfiles index a015dc79d..d540450e3 100644 --- a/Completion/Core/.distfiles +++ b/Completion/Core/.distfiles @@ -1,10 +1,10 @@ DISTFILES_SRC=' .distfiles _alternative _approximate _compalso _complete _correct _description - _expand _files _funcall _list _main_complete _match - _matcher _menu _multi_parts _message _normal _oldlist - _options _parameters _path_files _prefix _requested - _sep_parts _set_options _setup _sort_tags _tags + _expand _files _funcall _list _main_complete _match _matcher + _menu _multi_parts _message _normal _oldlist _options + _parameters _path_files _prefix _requested _sep_parts + _set_options _setup _sort_tags _tags _unset_options _wanted compdump compinit compinstall ' diff --git a/Completion/User/_mailboxes b/Completion/User/_mailboxes index a0c95859d..97628ef9a 100644 --- a/Completion/User/_mailboxes +++ b/Completion/User/_mailboxes @@ -38,9 +38,5 @@ if (( ! $+_mailbox_cache )) then _mailbox_cache=($_mailbox_cache $mboxes $maildirboxes $MHboxes) fi -if _wanted files expl 'mailbox specification'; then - local opre=$PREFIX - [[ $PREFIX = +* ]] && PREFIX="$~maildirectory/${PREFIX#+}" +_wanted files expl 'mailbox specification' && compadd "$@" "$expl[@]" - "$_mailbox_cache[@]" - PREFIX=$opre -fi diff --git a/Completion/User/_mutt b/Completion/User/_mutt index 851db8f7e..dfb50ae3a 100644 --- a/Completion/User/_mutt +++ b/Completion/User/_mutt @@ -1,6 +1,6 @@ #compdef mutt -local curcontext="$curcontext" state line ret=1 +local curcontext="$curcontext" state line muttrc="~/.muttrc" ret=1 _arguments -C \ '::recipient:->userhost' \ |