--- /dev/null
+Return-Path: <todd@electricoding.com>\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 97F23431FC9\r
+ for <notmuch@notmuchmail.org>; Tue, 13 Jan 2015 16:01:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+ tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 1EleHLaXeBp5 for <notmuch@notmuchmail.org>;\r
+ Tue, 13 Jan 2015 16:01:05 -0800 (PST)\r
+Received: from s75.web-hosting.com (s75.web-hosting.com [198.187.31.9])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 35AF6431FBF\r
+ for <notmuch@notmuchmail.org>; Tue, 13 Jan 2015 16:01:03 -0800 (PST)\r
+Received: from user-69-73-37-128.knology.net ([69.73.37.128]:38910\r
+ helo=localhost.localdomain)\r
+ by server75.web-hosting.com with esmtpsa (UNKNOWN:AES128-SHA256:128)\r
+ (Exim 4.82) (envelope-from <todd@electricoding.com>)\r
+ id 1YBBOQ-001yjE-G2; Tue, 13 Jan 2015 19:01:02 -0500\r
+From: Todd <todd@electricoding.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 4/5] Update completions for Emacs and bash\r
+Date: Tue, 13 Jan 2015 18:00:27 -0600\r
+Message-Id: <1421193628-2699-5-git-send-email-todd@electricoding.com>\r
+X-Mailer: git-send-email 1.9.1\r
+In-Reply-To: <1421193628-2699-1-git-send-email-todd@electricoding.com>\r
+References: <1421193628-2699-1-git-send-email-todd@electricoding.com>\r
+In-Reply-To: <8761ce7s16.fsf@nikula.org>\r
+References: <8761ce7s16.fsf@nikula.org>\r
+X-AntiAbuse: This header was added to track abuse,\r
+ please include it with any abuse report\r
+X-AntiAbuse: Primary Hostname - server75.web-hosting.com\r
+X-AntiAbuse: Original Domain - notmuchmail.org\r
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]\r
+X-AntiAbuse: Sender Address Domain - electricoding.com\r
+X-Get-Message-Sender-Via: server75.web-hosting.com: authenticated_id:\r
+ todd@electricoding.com\r
+X-Source: \r
+X-Source-Args: \r
+X-Source-Dir: \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: Wed, 14 Jan 2015 00:01:05 -0000\r
+\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
+ 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