From 3f84b058e76d966b558f66231b30836c9f0f7910 Mon Sep 17 00:00:00 2001 From: Todd Date: Wed, 14 Jan 2015 18:00:27 +1800 Subject: [PATCH] [PATCH v2 4/5] Update completions for Emacs and bash --- fe/b8ae11ecbf50d5ea07d37067bcfc8ee8ce64e9 | 98 +++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 fe/b8ae11ecbf50d5ea07d37067bcfc8ee8ce64e9 diff --git a/fe/b8ae11ecbf50d5ea07d37067bcfc8ee8ce64e9 b/fe/b8ae11ecbf50d5ea07d37067bcfc8ee8ce64e9 new file mode 100644 index 000000000..07fae7db8 --- /dev/null +++ b/fe/b8ae11ecbf50d5ea07d37067bcfc8ee8ce64e9 @@ -0,0 +1,98 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 97F23431FC9 + for ; Tue, 13 Jan 2015 16:01:05 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: 2.438 +X-Spam-Level: ** +X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 1EleHLaXeBp5 for ; + Tue, 13 Jan 2015 16:01:05 -0800 (PST) +Received: from s75.web-hosting.com (s75.web-hosting.com [198.187.31.9]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 35AF6431FBF + for ; Tue, 13 Jan 2015 16:01:03 -0800 (PST) +Received: from user-69-73-37-128.knology.net ([69.73.37.128]:38910 + helo=localhost.localdomain) + by server75.web-hosting.com with esmtpsa (UNKNOWN:AES128-SHA256:128) + (Exim 4.82) (envelope-from ) + id 1YBBOQ-001yjE-G2; Tue, 13 Jan 2015 19:01:02 -0500 +From: Todd +To: notmuch@notmuchmail.org +Subject: [PATCH v2 4/5] Update completions for Emacs and bash +Date: Tue, 13 Jan 2015 18:00:27 -0600 +Message-Id: <1421193628-2699-5-git-send-email-todd@electricoding.com> +X-Mailer: git-send-email 1.9.1 +In-Reply-To: <1421193628-2699-1-git-send-email-todd@electricoding.com> +References: <1421193628-2699-1-git-send-email-todd@electricoding.com> +In-Reply-To: <8761ce7s16.fsf@nikula.org> +References: <8761ce7s16.fsf@nikula.org> +X-AntiAbuse: This header was added to track abuse, + please include it with any abuse report +X-AntiAbuse: Primary Hostname - server75.web-hosting.com +X-AntiAbuse: Original Domain - notmuchmail.org +X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] +X-AntiAbuse: Sender Address Domain - electricoding.com +X-Get-Message-Sender-Via: server75.web-hosting.com: authenticated_id: + todd@electricoding.com +X-Source: +X-Source-Args: +X-Source-Dir: +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 14 Jan 2015 00:01:05 -0000 + +This adds completions for Emacs and bash, ZSH does not appear to have +completions for search terms. +--- + completion/notmuch-completion.bash | 2 +- + emacs/notmuch.el | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash +index d58dc8b..05b5969 100644 +--- a/completion/notmuch-completion.bash ++++ b/completion/notmuch-completion.bash +@@ -61,7 +61,7 @@ _notmuch_search_terms() + sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) ) + ;; + *) +- local search_terms="from: to: subject: attachment: tag: id: thread: folder: path: date:" ++ local search_terms="from: to: subject: attachment: contenttype: tag: id: thread: folder: path: date:" + compopt -o nospace + COMPREPLY=( $(compgen -W "${search_terms}" -- ${cur}) ) + ;; +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 218486a..ab00454 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -858,7 +858,7 @@ PROMPT is the string to prompt with." + (lexical-let + ((completions + (append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:" +- "subject:" "attachment:") ++ "subject:" "attachment:" "mimetype:") + (mapcar (lambda (tag) + (concat "tag:" (notmuch-escape-boolean-term tag))) + (process-lines notmuch-command "search" "--output=tags" "*"))))) +-- +1.9.1 + -- 2.26.2