Merge tag '0.34.3'

[notmuch] / completion / notmuch-completion.bash

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index f94dbeed66bdef7a4f757d8cb346fa008b1e6e88..0022b54bff5df41765aecdd640484a6dd53b5e5f 100644 (file)
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -103,12 +103,12 @@ _notmuch_search_terms()
            COMPREPLY=( $(compgen -P "from:" -W "`_notmuch_email ${cur}`" -- ${cur##from:}) )
            ;;
        path:*)
-           local path=`notmuch config get database.path`
+           local path=`notmuch config get database.mail_root`
            compopt -o nospace
            COMPREPLY=( $(compgen -d "$path/${cur##path:}" | sed "s|^$path/||" ) )
            ;;
        folder:*)
-           local path=`notmuch config get database.path`
+           local path=`notmuch config get database.mail_root`
            compopt -o nospace
            COMPREPLY=( $(compgen -d "$path/${cur##folder:}" | \
                sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
@@ -281,14 +281,14 @@ _notmuch_insert()
     $split &&
     case "${prev}" in
        --folder)
-           local path=`notmuch config get database.path`
+           local path=`notmuch config get database.mail_root`
            compopt -o nospace
            COMPREPLY=( $(compgen -d "$path/${cur}" | \
                sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
            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
@@ -351,7 +351,7 @@ _notmuch_reply()
            return
            ;;
        --decrypt)
-           COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) )
+           COMPREPLY=( $( compgen -W "true auto false" -- "${cur}" ) )
            return
            ;;
     esac
@@ -442,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
@@ -472,7 +472,7 @@ _notmuch_address()
            return
            ;;
        --output)
-           COMPREPLY=( $( compgen -W "sender recipients count" -- "${cur}" ) )
+           COMPREPLY=( $( compgen -W "sender recipients count address" -- "${cur}" ) )
            return
            ;;
        --sort)
@@ -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 stash" -- "${cur}" ) )
+           return
+           ;;
     esac
 
     ! $split &&
@@ -607,7 +611,7 @@ _notmuch()
        esac
     elif [ "${arg}" = "help" ]; then
        # handle help command specially due to _notmuch_commands usage
-       local help_topics="$_notmuch_commands hooks search-terms"
+       local help_topics="$_notmuch_commands hooks search-terms properties"
        COMPREPLY=( $(compgen -W "${help_topics}" -- ${cur}) )
     else
        # complete using _notmuch_subcommand if one exist