--- /dev/null
+Return-Path: <jrollins@finestructure.net>\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 C3E0041ED91\r
+ for <notmuch@notmuchmail.org>; Mon, 2 Apr 2012 01:21:13 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_MED=-2.3] 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 rQyxr-4fC2YT for <notmuch@notmuchmail.org>;\r
+ Mon, 2 Apr 2012 01:21:12 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+ [131.215.239.19])\r
+ by olra.theworths.org (Postfix) with ESMTP id 76B0F431FD6\r
+ for <notmuch@notmuchmail.org>; Mon, 2 Apr 2012 01:21:03 -0700 (PDT)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+ by earth-doxen-postvirus (Postfix) with ESMTP id 4360366E00C0\r
+ for <notmuch@notmuchmail.org>; Mon, 2 Apr 2012 01:21:03 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from finestructure.net (unknown [76.89.193.65])\r
+ (Authenticated sender: jrollins)\r
+ by earth-doxen-submit (Postfix) with ESMTP id E2A0566E00E3\r
+ for <notmuch@notmuchmail.org>; Mon, 2 Apr 2012 01:20:56 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+ id 8EA2A54F; Mon, 2 Apr 2012 01:20:56 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 1/6] emacs: update tag-completion function\r
+Date: Mon, 2 Apr 2012 01:20:48 -0700\r
+Message-Id: <1333354853-25729-2-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333354853-25729-1-git-send-email-jrollins@finestructure.net>\r
+References: <1333354853-25729-1-git-send-email-jrollins@finestructure.net>\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: Mon, 02 Apr 2012 08:21:14 -0000\r
+\r
+"search-tags" is deprecated, so we move to the more modern "search\r
+--output=tags".\r
+---\r
+ emacs/notmuch.el | 2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index f0afa07..38ae005 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -89,7 +89,7 @@ For example:\r
+ (with-output-to-string\r
+ (with-current-buffer standard-output\r
+ (apply 'call-process notmuch-command nil t\r
+- nil "search-tags" search-terms)))\r
++ nil "search" "--output=tags" search-terms)))\r
+ "\n+" t))\r
+ \r
+ (defun notmuch-select-tag-with-completion (prompt &rest search-terms)\r
+-- \r
+1.7.9.1\r
+\r