X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-completion.bash;h=03412117bb1c6240c0d7c7fe8b481341d8146c8e;hp=ad55f6d3c9d4d84f1157bb5208ad755dde665460;hb=dad3dd64b728e21816c9cd1e3000b6494731a459;hpb=36809b5dfb2344c9d3ce4220b2717fd0306e216b

diff --git a/notmuch-completion.bash b/notmuch-completion.bash
index ad55f6d3..03412117 100644
--- a/notmuch-completion.bash
+++ b/notmuch-completion.bash
@@ -1,4 +1,4 @@
-# Bash completion for notmutch
+# Bash completion for notmuch
 #
 # Copyright © 2009 Carl Worth
 #
@@ -27,24 +27,45 @@
 #
 #	new
 #
-#	search <search-term> [...]
+#	search [options] <search-term> [...]
 #
-#	show <thread-id>
+#	show <search-terms>
+#
+#	reply <search-terms>
+#
+#	tag +<tag>|-<tag> [...] [--] <search-terms> [...]
 #
 #	dump [<filename>]
 #
 #	restore <filename>
+#
+#	help [<command>]
 
 _notmuch()
 {
-    current="$2"
+    local current previous commands help_options
 
-    commands="help setup new search show dump restore"
+    previous=${COMP_WORDS[COMP_CWORD-1]}
+    current="${COMP_WORDS[COMP_CWORD]}"
+
+    commands="setup new search show reply tag dump restore help"
+    help_options="setup new search show reply tag dump restore search-terms"
+    search_options="--max-threads= --first= --sort=oldest-first --sort=newest-first"
 
     COMPREPLY=()
 
-    if [ "$COMP_CWORD" = "1" ]; then
-	COMPREPLY=( $(compgen -W "${commands}" -- ${current}) )
-    fi
+    case $COMP_CWORD in
+        1)
+            COMPREPLY=( $(compgen -W "${commands}" -- ${current}) ) ;;
+        2)
+            case $previous in
+                help)
+                    COMPREPLY=( $(compgen -W "${help_options}" -- ${current}) ) ;;
+                search)
+                    COMPREPLY=( $(compgen -W "${search_options}" -- ${current}) ) ;;
+            esac
+            ;;
+    esac
 }
+
 complete -o default -o bashdefault -F _notmuch notmuch