Re: [PATCH v2 4/5] Update completions for Emacs and bash

diff --git a/e0/a4b34acc55aef70414fac453863b08ee3b362a b/e0/a4b34acc55aef70414fac453863b08ee3b362a
new file mode 100644 (file)
index 0000000..d51b551
--- /dev/null
+++ b/e0/a4b34acc55aef70414fac453863b08ee3b362a
@@ -0,0 +1,117 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3539C431FD8\r
+       for <notmuch@notmuchmail.org>; Thu, 15 Jan 2015 09:17:12 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.738\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.738 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438, RCVD_IN_DNSWL_LOW=-0.7]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id O9vuDxVl-mlt for <notmuch@notmuchmail.org>;\r
+       Thu, 15 Jan 2015 09:17:09 -0800 (PST)\r
+Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com\r
+ [74.125.82.50])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ C715A431FBC   for <notmuch@notmuchmail.org>; Thu, 15 Jan 2015 09:17:08 -0800\r
+ (PST)\r
+Received: by mail-wg0-f50.google.com with SMTP id a1so16184175wgh.9\r
+       for <notmuch@notmuchmail.org>; Thu, 15 Jan 2015 09:17:06 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:subject:in-reply-to:references\r
+       :user-agent:date:message-id:mime-version:content-type;\r
+       bh=tTAV9Oa6LSNzkm9k/Ln5GJh4wWRR+VVGRekXndcHL7U=;\r
+       b=dEKoozkHOqHi06skVJw5bJr+Xoeu8i7oyz4MZB0gLqqfSTd6kaTSKXHFAIVoiJbITM\r
+       kaSL+gGYk8zuWcohOQqJAqLts3jND/Mikn/ENmxANViB4nFjksQmwKiS5ZwMylFWxYRd\r
+       i5l6LFpgKkTeMC4GB512baZvTik4ve18Az34zBxDMA4RzskNwg0vWBOOeJKpNTq6rK2+\r
+       DzU+xCjKldE90oyXGcqFcoTLirW5xOms9Fc8525dWgXhl2FwCavHgrAAdB9UDVBsxEO3\r
+       GblWPOjcfEzgfF5dLNEOJReTTnkrt0k86XgxcUTKRaf8j0UELjql25tt1sHDQoFygDDG\r
+       zptQ==\r
+X-Gm-Message-State:\r
+ ALoCoQnCyLfKAl/h65GDcwK2BV/QcbwBl4P24laOIq7Ayphm0aI4ngq5Y1VAHhAE75juCfZm3CDH\r
+X-Received: by 10.180.75.176 with SMTP id d16mr20840711wiw.77.1421342226476;\r
+       Thu, 15 Jan 2015 09:17:06 -0800 (PST)\r
+Received: from localhost (mobile-internet-bcee14-89.dhcp.inet.fi.\r
+       [188.238.20.89])\r
+       by mx.google.com with ESMTPSA id gl5sm3358468wib.0.2015.01.15.09.17.05\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Thu, 15 Jan 2015 09:17:05 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Todd <todd@electricoding.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 4/5] Update completions for Emacs and bash\r
+In-Reply-To: <1421193628-2699-5-git-send-email-todd@electricoding.com>\r
+References: <1421193628-2699-1-git-send-email-todd@electricoding.com>\r
+       <1421193628-2699-5-git-send-email-todd@electricoding.com>\r
+User-Agent: Notmuch/0.19+19~g9060a1f (http://notmuchmail.org) Emacs/24.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 15 Jan 2015 19:17:18 +0200\r
+Message-ID: <874mrs9d5t.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 15 Jan 2015 17:17:12 -0000\r
+\r
+On Wed, 14 Jan 2015, Todd <todd@electricoding.com> wrote:\r
+> This adds completions for Emacs and bash, ZSH does not appear to have\r
+> completions for search terms.\r
+> ---\r
+>  completion/notmuch-completion.bash | 2 +-\r
+>  emacs/notmuch.el                   | 2 +-\r
+>  2 files changed, 2 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash\r
+> index d58dc8b..05b5969 100644\r
+> --- a/completion/notmuch-completion.bash\r
+> +++ b/completion/notmuch-completion.bash\r
+> @@ -61,7 +61,7 @@ _notmuch_search_terms()\r
+>              sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )\r
+>          ;;\r
+>      *)\r
+> -        local search_terms="from: to: subject: attachment: tag: id: thread: folder: path: date:"\r
+> +        local search_terms="from: to: subject: attachment: contenttype: tag: id: thread: folder: path: date:"\r
+\r
+Should be mimetype.\r
+\r
+BR,\r
+Jani.\r
+\r
+>          compopt -o nospace\r
+>          COMPREPLY=( $(compgen -W "${search_terms}" -- ${cur}) )\r
+>          ;;\r
+> diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> index 218486a..ab00454 100644\r
+> --- a/emacs/notmuch.el\r
+> +++ b/emacs/notmuch.el\r
+> @@ -858,7 +858,7 @@ PROMPT is the string to prompt with."\r
+>    (lexical-let\r
+>        ((completions\r
+>      (append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"\r
+> -                  "subject:" "attachment:")\r
+> +                  "subject:" "attachment:" "mimetype:")\r
+>              (mapcar (lambda (tag)\r
+>                        (concat "tag:" (notmuch-escape-boolean-term tag)))\r
+>                      (process-lines notmuch-command "search" "--output=tags" "*")))))\r
+> -- \r
+> 1.9.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r