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

diff --git a/notmuch-completion.bash b/notmuch-completion.bash
index 42557173..03412117 100644
--- a/notmuch-completion.bash
+++ b/notmuch-completion.bash
@@ -43,21 +43,29 @@
 
 _notmuch()
 {
-    current="$2"
+    local current previous commands help_options
 
-    commands="setup new search show reply tag dump restore help"
+    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=()
-    prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    if [ "$COMP_CWORD" = "1" ]; then
-	COMPREPLY=( $(compgen -W "${commands}" -- ${current}) )
-    fi
-
-    if [ $prev = "help" ] && [ "$COMP_CWORD" = "2" ]; then
-	COMPREPLY=( $(compgen -W "${help_options}" -- ${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