X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=completion%2Fnotmuch-completion.bash;h=0022b54bff5df41765aecdd640484a6dd53b5e5f;hb=f9d8f9c6bae1a9ea60b41755008b71381464e208;hp=adf64a0aebf3ae0a1654cd7312af4c70cbdb742d;hpb=f3fc97c0008c1d48ccac88c52b5bae61460bfa3f;p=notmuch

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index adf64a0a..0022b54b 100644
--- 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,7 +281,7 @@ _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\)$" ) )
@@ -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 stash" -- "${cur}" ) )
+	    return
+	    ;;
     esac
 
     ! $split &&