completion: fail silently if _init_completion is not found

[notmuch] / completion / notmuch-completion.bash

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 0f132043dea5e89219f6853714b63c74ac101476..0571dc9da8e332b3fa3c24ab27e9fa61a3c637f4 100644 (file)
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -49,8 +49,19 @@ _notmuch_search_terms()
        from:*)
            COMPREPLY=( $(compgen -P "from:" -W "`_notmuch_user_emails`" -- ${cur##from:}) )
            ;;
+       path:*)
+           local path=`notmuch config get database.path`
+           compopt -o nospace
+           COMPREPLY=( $(compgen -d "$path/${cur##path:}" | sed "s|^$path/||" ) )
+           ;;
+       folder:*)
+           local path=`notmuch config get database.path`
+           compopt -o nospace
+           COMPREPLY=( $(compgen -d "$path/${cur##folder:}" | \
+               sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
+           ;;
        *)
-           local search_terms="from: to: subject: attachment: tag: id: thread: folder: date:"
+           local search_terms="from: to: subject: attachment: tag: id: thread: folder: path: date:"
            compopt -o nospace
            COMPREPLY=( $(compgen -W "${search_terms}" -- ${cur}) )
            ;;
@@ -67,7 +78,7 @@ _notmuch_compact()
     $split &&
     case "${prev}" in
        --backup)
-           _filedir
+           _filedir -d
            return
            ;;
     esac
@@ -96,7 +107,7 @@ _notmuch_config()
            ;;
        # these will also complete on config get, but we don't care
        database.path)
-           _filedir
+           _filedir -d
            ;;
        maildir.synchronize_flags)
            COMPREPLY=( $(compgen -W "true false" -- ${cur}) )
@@ -384,6 +395,10 @@ _notmuch()
 {
     local _notmuch_commands="compact config count dump help insert new reply restore search setup show tag"
     local arg cur prev words cword split
+
+    # require bash-completion with _init_completion
+    type -t _init_completion >/dev/null 2>&1 || return
+
     _init_completion || return
 
     COMPREPLY=()