[PATCH v2 6/7] emacs: Allow custom tags formatting

diff --git a/15/90a2e7c68d730e2d3348b8b180e2e3753ac766 b/15/90a2e7c68d730e2d3348b8b180e2e3753ac766
new file mode 100644 (file)
index 0000000..8f0302e
--- /dev/null
+++ b/15/90a2e7c68d730e2d3348b8b180e2e3753ac766
@@ -0,0 +1,108 @@
+Return-Path: <amdragon@mit.edu>\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 BC75D42119B\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 JIHSj1kdfDxr for <notmuch@notmuchmail.org>;\r
+       Fri, 13 Jul 2012 20:43:39 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+       [18.9.25.14])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9CD66431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:39 -0700 (PDT)\r
+X-AuditID: 1209190e-b7fb56d0000008b2-58-5000eaeb61d5\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 6B.44.02226.BEAE0005; Fri, 13 Jul 2012 23:43:39 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q6E3hcYB026807; \r
+       Fri, 13 Jul 2012 23:43:38 -0400\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6E3hbPi021333\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 13 Jul 2012 23:43:38 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SptGa-0000a8-V6; Fri, 13 Jul 2012 23:43:36 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 6/7] emacs: Allow custom tags formatting\r
+Date: Fri, 13 Jul 2012 23:43:25 -0400\r
+Message-Id: <1342237406-32507-7-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1342237406-32507-1-git-send-email-amdragon@mit.edu>\r
+References: <1342140319-19859-1-git-send-email-amdragon@mit.edu>\r
+       <1342237406-32507-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6nrvv6FUOAwdef7Bar5/JYXL85k9mB\r
+       yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgymibspu14DV3xeqeXrYGxhOcXYycHBICJhJX\r
+       195kg7DFJC7cWw9kc3EICexjlFiz8CczhLOBUeLY5eVMEM4jJon7655DOXMZJX7f38QO0s8m\r
+       oCGxbf9yRhBbREBaYufd2awgNrOAo8Tn/YvAdggLWEscaN4OVs8ioCqx5PBRFhCbV8BBYuLb\r
+       LVB3yEs8vd8HZnMC9bb13gabKSRQLnH92xqmCYz8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWl\r
+       Fuka6+VmluilppRuYgSFEqck3w7GrweVDjEKcDAq8fBm+jMECLEmlhVX5h5ilORgUhLl5QUG\r
+       ohBfUn5KZUZicUZ8UWlOavEhRgkOZiURXvM2oBxvSmJlVWpRPkxKmoNFSZz3SspNfyGB9MSS\r
+       1OzU1ILUIpisDAeHkgRvD8hQwaLU9NSKtMycEoQ0EwcnyHAeoOGTQWp4iwsSc4sz0yHypxgV\r
+       pcR5C0ASAiCJjNI8uF5YrL9iFAd6RZi3EqSKB5gm4LpfAQ1mAho86+c/f6DBJYkIKakGxrWV\r
+       We6PCiYn+1lvmBLyMDZd9oXdbxn2J8Kl0RGT5rhfs195fWbIhp7jbOVT+qJ2M/Y5ik1Ymxcj\r
+       3Nb2zH3uy/NfE+YZd6tcZRNxeXpENtv9w54fvEXpN7ZP8dmx7l3RnxcxZ3VPms3W49Wz0b18\r
+       O94vgyP4fVzAt3cvavPvL968eBHjBZENVUosxRmJhlrMRcWJAIoqkL/QAgAA\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: Sat, 14 Jul 2012 03:43:42 -0000\r
+\r
+Previously we ignored any notmuch-search-result-format customizations\r
+for tag formatting because we needed to be able to parse back in the\r
+result line and update the tags in place.  We no longer do either of\r
+these things, so we can allow customization of this format.\r
+\r
+(Coincidentally, previously we still allowed too much customization of\r
+the tags format, since moving it earlier on the line or removing it\r
+from the line would interfere with the tagging mechanism.  There is\r
+now no problem with doing such things.)\r
+---\r
+ emacs/notmuch.el |    8 +++-----\r
+ 1 file changed, 3 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 9e061b6..d0a8021 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -759,11 +759,9 @@ non-authors is found, assume that all of the authors match."\r
+     (notmuch-search-insert-authors format-string (plist-get result :authors)))\r
+ \r
+    ((string-equal field "tags")\r
+-    ;; Ignore format-string here because notmuch-search-set-tags\r
+-    ;; depends on the format of this\r
+-    (insert (concat "(" (propertize\r
+-                       (mapconcat 'identity (plist-get result :tags) " ")\r
+-                       'font-lock-face 'notmuch-tag-face) ")")))))\r
++    (let ((tags-str (mapconcat 'identity (plist-get result :tags) " ")))\r
++      (insert (propertize (format format-string tags-str)\r
++                        'face 'notmuch-tag-face))))))\r
+ \r
+ (defun notmuch-search-show-result (result &optional pos)\r
+   "Insert RESULT at POS or the end of the buffer if POS is null."\r
+-- \r
+1.7.10\r
+\r