diff options
| author | David Bremner <david@tethera.net> | 2017-12-31 09:26:13 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-12-31 09:26:13 -0400 |
| commit | 99407db25cbd44f915fb33708c497bc375ff63de (patch) | |
| tree | 2b357c6cb01ac5ec9ce2e262077184c9f7a7b075 /completion | |
| parent | e5e252de5560fee386bd46f8f279c800b953c667 (diff) | |
| parent | eff029de4a8782ccfe20e26814c740a271cb5285 (diff) | |
Merge branch 'release'
Conflicts:
doc/man1/notmuch-reply.rst
doc/man1/notmuch-show.rst
Conflicts taken from release (dkg's doc changes)
Diffstat (limited to 'completion')
| -rw-r--r-- | completion/notmuch-completion.bash | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash index adf64a0a..249b9664 100644 --- a/completion/notmuch-completion.bash +++ b/completion/notmuch-completion.bash @@ -351,7 +351,7 @@ _notmuch_reply() return ;; --decrypt) - COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) ) + COMPREPLY=( $( compgen -W "true auto false" -- "${cur}" ) ) return ;; esac @@ -517,10 +517,14 @@ _notmuch_show() COMPREPLY=( $( compgen -W "text json sexp mbox raw" -- "${cur}" ) ) return ;; - --exclude|--body|--decrypt) + --exclude|--body) COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) ) return ;; + --decrypt) + COMPREPLY=( $( compgen -W "true auto false" -- "${cur}" ) ) + return + ;; esac ! $split && |