--- /dev/null
+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 9AB20431FBC\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Jul 2012 14:15:24 -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 Ns0iuNwK1DTI for <notmuch@notmuchmail.org>;\r
+ Sat, 14 Jul 2012 14:15:20 -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 3EF82431FBD\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Jul 2012 14:15:20 -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 1Sq9gJ-0000nk-4d; Sat, 14 Jul 2012 22:15:15 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Sq9gI-0004CH-Jg; Sat, 14 Jul 2012 22:15:14 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 4/7] emacs: Use result text properties for search\r
+ result iteration\r
+In-Reply-To: <1342237406-32507-5-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
+ <1342237406-32507-5-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.13.2+90~g84fa1ef (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sat, 14 Jul 2012 22:15:12 +0100\r
+Message-ID: <871ukexcwv.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 2309eaf59de0d436422e359abb5adb3a (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\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 -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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 21:15:24 -0000\r
+\r
+\r
+On Sat, 14 Jul 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> This simplifies the traversal of regions of results and eliminates the\r
+> need for save-excursions (which tend to get in the way of maintaining\r
+> point when we make changes to the buffer). It also fixes some strange\r
+> corner cases in the old line-based code where results that bordered\r
+> the region but were not included in it could be affected by region\r
+> commands. Coincidentally, this also essentially enables multi-line\r
+> search result formats; the only remaining non-multi-line-capable\r
+> functions are notmuch-search-{next,previous}-thread, which are only\r
+> used interactively.\r
+\r
+Having understood how macros work (thanks to Austin's patient\r
+explanations on irc) this looks fine. So +1 for the whole series.\r
+\r
+Best wishes\r
+\r
+Mark\r
+> ---\r
+> emacs/notmuch.el | 61 ++++++++++++++++++++++++++++++------------------------\r
+> 1 file changed, 34 insertions(+), 27 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> index 8e1a769..92ba2c1 100644\r
+> --- a/emacs/notmuch.el\r
+> +++ b/emacs/notmuch.el\r
+> @@ -427,17 +427,33 @@ returns nil"\r
+> (next-single-property-change (or pos (point)) 'notmuch-search-result\r
+> nil (point-max))))\r
+> \r
+> +(defmacro notmuch-search-do-results (beg end pos-sym &rest body)\r
+> + "Invoke BODY for each result between BEG and END.\r
+> +\r
+> +POS-SYM will be bound to the point at the beginning of the\r
+> +current result."\r
+> + (declare (indent 3))\r
+> + (let ((end-sym (make-symbol "end"))\r
+> + (first-sym (make-symbol "first")))\r
+> + `(let ((,pos-sym (notmuch-search-result-beginning ,beg))\r
+> + ;; End must be a marker in case body changes the text\r
+> + (,end-sym (copy-marker ,end))\r
+> + ;; Make sure we examine one result, even if (= beg end)\r
+> + (,first-sym t))\r
+> + ;; We have to be careful if the region extends beyond the\r
+> + ;; results. In this case, pos could be null or there could be\r
+> + ;; no result at pos.\r
+> + (while (and ,pos-sym (or (< ,pos-sym ,end-sym) ,first-sym))\r
+> + (when (notmuch-search-get-result ,pos-sym)\r
+> + ,@body)\r
+> + (setq ,pos-sym (notmuch-search-result-end ,pos-sym)\r
+> + ,first-sym nil)))))\r
+> +\r
+> (defun notmuch-search-properties-in-region (property beg end)\r
+> - (save-excursion\r
+> - (let ((output nil)\r
+> - (last-line (line-number-at-pos end))\r
+> - (max-line (- (line-number-at-pos (point-max)) 2)))\r
+> - (goto-char beg)\r
+> - (beginning-of-line)\r
+> - (while (<= (line-number-at-pos) (min last-line max-line))\r
+> - (setq output (cons (get-text-property (point) property) output))\r
+> - (forward-line 1))\r
+> - output)))\r
+> + (let (output)\r
+> + (notmuch-search-do-results beg end pos\r
+> + (push (get-text-property pos property) output))\r
+> + output))\r
+> \r
+> (defun notmuch-search-find-thread-id ()\r
+> "Return the thread for the current thread"\r
+> @@ -517,28 +533,19 @@ and will also appear in a buffer named \"*Notmuch errors*\"."\r
+> (plist-get (notmuch-search-get-result pos) :tags))\r
+> \r
+> (defun notmuch-search-get-tags-region (beg end)\r
+> - (save-excursion\r
+> - (let ((output nil)\r
+> - (last-line (line-number-at-pos end))\r
+> - (max-line (- (line-number-at-pos (point-max)) 2)))\r
+> - (goto-char beg)\r
+> - (while (<= (line-number-at-pos) (min last-line max-line))\r
+> - (setq output (append output (notmuch-search-get-tags)))\r
+> - (forward-line 1))\r
+> - output)))\r
+> + (let (output)\r
+> + (notmuch-search-do-results beg end pos\r
+> + (setq output (append output (notmuch-search-get-tags pos))))\r
+> + output))\r
+> \r
+> (defun notmuch-search-tag-region (beg end &optional tag-changes)\r
+> "Change tags for threads in the given region."\r
+> (let ((search-string (notmuch-search-find-thread-id-region-search beg end)))\r
+> (setq tag-changes (funcall 'notmuch-tag search-string tag-changes))\r
+> - (save-excursion\r
+> - (let ((last-line (line-number-at-pos end))\r
+> - (max-line (- (line-number-at-pos (point-max)) 2)))\r
+> - (goto-char beg)\r
+> - (while (<= (line-number-at-pos) (min last-line max-line))\r
+> - (notmuch-search-set-tags\r
+> - (notmuch-update-tags (notmuch-search-get-tags) tag-changes))\r
+> - (forward-line))))))\r
+> + (notmuch-search-do-results beg end pos\r
+> + (notmuch-search-set-tags\r
+> + (notmuch-update-tags (notmuch-search-get-tags pos) tag-changes)\r
+> + pos))))\r
+> \r
+> (defun notmuch-search-tag (&optional tag-changes)\r
+> "Change tags for the currently selected thread or region.\r
+> -- \r
+> 1.7.10\r
projects / notmuch-archives.git / commitdiff