[PATCH v3 6/8] emacs: Allow custom tags formatting
authorAustin Clements <amdragon@MIT.EDU>
Sat, 14 Jul 2012 23:02:18 +0000 (19:02 +2000)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:48:20 +0000 (09:48 -0800)
18/6e77c3d1490a6cbc64da7e6880e9acbb099e19 [new file with mode: 0644]

diff --git a/18/6e77c3d1490a6cbc64da7e6880e9acbb099e19 b/18/6e77c3d1490a6cbc64da7e6880e9acbb099e19
new file mode 100644 (file)
index 0000000..0a66007
--- /dev/null
@@ -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 32DDD41EC14\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Jul 2012 16:02:31 -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 1UoXcXlS8EFS for <notmuch@notmuchmail.org>;\r
+       Sat, 14 Jul 2012 16:02:29 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id D66EA429E27\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Jul 2012 16:02:26 -0700 (PDT)\r
+X-AuditID: 12074422-b7f1f6d00000090b-04-5001fa82db06\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 3F.E8.02315.28AF1005; Sat, 14 Jul 2012 19:02:26 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q6EN2Pmm015443; \r
+       Sat, 14 Jul 2012 19:02:25 -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 q6EN2OBm008498\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 14 Jul 2012 19:02:25 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SqBM0-0002GG-0l; Sat, 14 Jul 2012 19:02:24 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 6/8] emacs: Allow custom tags formatting\r
+Date: Sat, 14 Jul 2012 19:02:18 -0400\r
+Message-Id: <1342306940-7499-7-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1342306940-7499-1-git-send-email-amdragon@mit.edu>\r
+References: <1342140319-19859-1-git-send-email-amdragon@mit.edu>\r
+       <1342306940-7499-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsUixCmqrNv0izHAoOcmm8WefV4Wq+fyWFy/\r
+       OZPZgdnj7mkuj52z7rJ7PFt1izmAOYrLJiU1J7MstUjfLoEr4++xx6wFr7krPlz8z97AeIKz\r
+       i5GTQ0LARGL51BMsELaYxIV769lAbCGBfYwSt2ZoQNgbGCVmneSHsB8xSezekQ1hz2WU+N0h\r
+       DGKzCWhIbNu/nBHEFhGQlth5dzYriM0skCbxvf0tWFxYwFpi89cDYPNZBFQlmpb9YwexeQXs\r
+       JS7sOcIMcYO8xNP7fWA1nAIOEocvnGCF2FUmcePJd9YJjPwLGBlWMcqm5Fbp5iZm5hSnJusW\r
+       Jyfm5aUW6Zrq5WaW6KWmlG5iBIUUu4vSDsafB5UOMQpwMCrx8Cb7MwQIsSaWFVfmHmKU5GBS\r
+       EuXd/JUxQIgvKT+lMiOxOCO+qDQntfgQowQHs5IIrwRIjjclsbIqtSgfJiXNwaIkznst5aa/\r
+       kEB6YklqdmpqQWoRTFaGg0NJgrfwJ1CjYFFqempFWmZOCUKaiYMTZDgP0PBukBre4oLE3OLM\r
+       dIj8KUZFKXHeXpCEAEgiozQPrhcW868YxYFeEeZdClLFA0wXcN2vgAYzAQ2e9fOfP9DgkkSE\r
+       lFQD46IKzgmHMy7UtLmmsDTV/az/pWy4MGPuyhDmkg7LaIWd0Vu+qXQq7f21WZ9nstXrNzos\r
+       jWcv2AdkWKls0lieaPV40XPhP73HeIwkn4eXRR5g0+06UJbCHPVx04nPZ4qOSl3f2pqQ1nxA\r
+       v2kna94vz6JHdgfrNmy2UO/97LB7ddXU99GJG2uPKbEUZyQaajEXFScCAPKym7HUAgAA\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 23:02:31 -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 8590529..86f59e0 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -774,11 +774,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