Merge branch 'release'

[notmuch] / completion / notmuch-completion.bash

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index e462a82a554eea393cf71f456f40e363160b4842..948c153be4b3eeb56db38cdb9420a8f6c025add0 100644 (file)
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -288,7 +288,7 @@ _notmuch_insert()
            return
            ;;
        --decrypt)
-           COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) )
+           COMPREPLY=( $( compgen -W "true false auto nostash" -- "${cur}" ) )
            return
            ;;
     esac
@@ -320,7 +320,7 @@ _notmuch_new()
     $split &&
     case "${prev}" in
        --decrypt)
-           COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) )
+           COMPREPLY=( $( compgen -W "true false auto nostash" -- "${cur}" ) )
            return
            ;;
     esac
@@ -350,12 +350,16 @@ _notmuch_reply()
            COMPREPLY=( $( compgen -W "all sender" -- "${cur}" ) )
            return
            ;;
+       --decrypt)
+           COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) )
+           return
+           ;;
     esac
 
     ! $split &&
     case "${cur}" in
        -*)
-           local options="--format= --format-version= --reply-to= --decrypt ${_notmuch_shared_options}"
+           local options="--format= --format-version= --reply-to= --decrypt= ${_notmuch_shared_options}"
            compopt -o nospace
            COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
            ;;
@@ -438,7 +442,7 @@ _notmuch_reindex()
     $split &&
     case "${prev}" in
        --decrypt)
-           COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) )
+           COMPREPLY=( $( compgen -W "true false auto nostash" -- "${cur}" ) )
            return
            ;;
     esac
@@ -513,7 +517,7 @@ _notmuch_show()
            COMPREPLY=( $( compgen -W "text json sexp mbox raw" -- "${cur}" ) )
            return
            ;;
-       --exclude|--body)
+       --exclude|--body|--decrypt)
            COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) )
            return
            ;;
@@ -522,7 +526,7 @@ _notmuch_show()
     ! $split &&
     case "${cur}" in
        -*)
-           local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt --include-html ${_notmuch_shared_options}"
+           local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt= --include-html ${_notmuch_shared_options}"
            compopt -o nospace
            COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
            ;;