Re: [PATCH 4/5] emacs: hello: switch notmuch-hello-insert-buttons to plists

diff --git a/91/a9ad9f009aaa6c8d92edf13f0e592b8a2ff01d b/91/a9ad9f009aaa6c8d92edf13f0e592b8a2ff01d
new file mode 100644 (file)
index 0000000..605a115
--- /dev/null
+++ b/91/a9ad9f009aaa6c8d92edf13f0e592b8a2ff01d
@@ -0,0 +1,111 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 475A8431FB6\r
+       for <notmuch@notmuchmail.org>; Sat,  5 Apr 2014 22:31:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, 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 E76VSXFl6Bnk for <notmuch@notmuchmail.org>;\r
+       Sat,  5 Apr 2014 22:31:36 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\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 27677431FAF\r
+       for <notmuch@notmuchmail.org>; Sat,  5 Apr 2014 22:31:36 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1WWfg3-0003UT-Jz; Sun, 06 Apr 2014 06:31:31 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1WWfg3-0003R7-5q; Sun, 06 Apr 2014 06:31:31 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>\r
+Subject: Re: [PATCH 4/5] emacs: hello: switch notmuch-hello-insert-buttons to\r
+       plists\r
+In-Reply-To: <20140406012425.GF15472@mit.edu>\r
+References: <1396733065-32602-1-git-send-email-markwalters1009@gmail.com>\r
+       <1396733065-32602-5-git-send-email-markwalters1009@gmail.com>\r
+       <20140406012425.GF15472@mit.edu>\r
+User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 06 Apr 2014 06:31:29 +0100\r
+Message-ID: <87vbunuiq6.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-Geographic: According to ripencc,\r
+       this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: c74662a89db8d8693277a51c71d49895 (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored 0.0 points. Summary of the scoring: \r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: notmuch@notmuchmail.org\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: Sun, 06 Apr 2014 05:31:42 -0000\r
+\r
+\r
+Hello\r
+\r
+>> @@ -455,23 +457,26 @@ (defun notmuch-hello-query-counts (query-list &rest options)\r
+>>       #'identity\r
+>>       (mapcar\r
+>>        (lambda (elem)\r
+>> -   (let ((name (notmuch-saved-search-get elem :name))\r
+>> -         (search-query (notmuch-saved-search-get elem :query))\r
+>> -         (message-count (prog1 (read (current-buffer))\r
+>> +   (let* ((elem-plist (notmuch-hello-saved-search-to-plist elem))\r
+>> +          (search-query (plist-get elem-plist :query))\r
+>> +          (filtered-query (notmuch-hello-filtered-query\r
+>> +                           search-query (plist-get options :filter)))\r
+>> +          (message-count (prog1 (read (current-buffer))\r
+>>                             (forward-line 1))))\r
+>>       (and (or (plist-get options :show-empty-searches) (> message-count 0))\r
+>> -          (list name (notmuch-hello-filtered-query\r
+>> -                      search-query (plist-get options :filter))\r
+>> -                message-count))))\r
+>> +          (setq elem-plist (plist-put elem-plist :query filtered-query))\r
+>\r
+> This technically works, but `setq' is a strange thing to see in an\r
+> `and'.  But the problem isn't the `setq'; it's that crazy `and'.  I'd\r
+> replace the `and' with `when', keep the `setq' and `plist-put' in the\r
+> body, and squint a lot less at this code.\r
+\r
+This was actually a bug on my part: the filtered query can be nil (which\r
+is used to mean hide this search); in earlier versions having a setq\r
+inside the `and' achieved this but obviously not in this plist form. I\r
+have switched to the when as suggested and added a test for\r
+filtered-query being nil.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r