From: Mark Walters Date: Sat, 14 Jul 2012 21:15:12 +0000 (+0100) Subject: Re: [PATCH v2 4/7] emacs: Use result text properties for search result iteration X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f22de05d8a563146d28ae6cc34792c19070cf9ff;p=notmuch-archives.git Re: [PATCH v2 4/7] emacs: Use result text properties for search result iteration --- diff --git a/de/d5fcec9b4356968d61a39f1915fcc73cdd165c b/de/d5fcec9b4356968d61a39f1915fcc73cdd165c new file mode 100644 index 000000000..326b4399e --- /dev/null +++ b/de/d5fcec9b4356968d61a39f1915fcc73cdd165c @@ -0,0 +1,187 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 9AB20431FBC + for ; Sat, 14 Jul 2012 14:15:24 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Ns0iuNwK1DTI for ; + Sat, 14 Jul 2012 14:15:20 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 3EF82431FBD + for ; Sat, 14 Jul 2012 14:15:20 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1Sq9gJ-0000nk-4d; Sat, 14 Jul 2012 22:15:15 +0100 +Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223] + helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1Sq9gI-0004CH-Jg; Sat, 14 Jul 2012 22:15:14 +0100 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH v2 4/7] emacs: Use result text properties for search + result iteration +In-Reply-To: <1342237406-32507-5-git-send-email-amdragon@mit.edu> +References: <1342140319-19859-1-git-send-email-amdragon@mit.edu> + <1342237406-32507-1-git-send-email-amdragon@mit.edu> + <1342237406-32507-5-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.13.2+90~g84fa1ef (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sat, 14 Jul 2012 22:15:12 +0100 +Message-ID: <871ukexcwv.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 94.192.233.223 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 2309eaf59de0d436422e359abb5adb3a (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + * domain + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 14 Jul 2012 21:15:24 -0000 + + +On Sat, 14 Jul 2012, Austin Clements wrote: +> This simplifies the traversal of regions of results and eliminates the +> need for save-excursions (which tend to get in the way of maintaining +> point when we make changes to the buffer). It also fixes some strange +> corner cases in the old line-based code where results that bordered +> the region but were not included in it could be affected by region +> commands. Coincidentally, this also essentially enables multi-line +> search result formats; the only remaining non-multi-line-capable +> functions are notmuch-search-{next,previous}-thread, which are only +> used interactively. + +Having understood how macros work (thanks to Austin's patient +explanations on irc) this looks fine. So +1 for the whole series. + +Best wishes + +Mark +> --- +> emacs/notmuch.el | 61 ++++++++++++++++++++++++++++++------------------------ +> 1 file changed, 34 insertions(+), 27 deletions(-) +> +> diff --git a/emacs/notmuch.el b/emacs/notmuch.el +> index 8e1a769..92ba2c1 100644 +> --- a/emacs/notmuch.el +> +++ b/emacs/notmuch.el +> @@ -427,17 +427,33 @@ returns nil" +> (next-single-property-change (or pos (point)) 'notmuch-search-result +> nil (point-max)))) +> +> +(defmacro notmuch-search-do-results (beg end pos-sym &rest body) +> + "Invoke BODY for each result between BEG and END. +> + +> +POS-SYM will be bound to the point at the beginning of the +> +current result." +> + (declare (indent 3)) +> + (let ((end-sym (make-symbol "end")) +> + (first-sym (make-symbol "first"))) +> + `(let ((,pos-sym (notmuch-search-result-beginning ,beg)) +> + ;; End must be a marker in case body changes the text +> + (,end-sym (copy-marker ,end)) +> + ;; Make sure we examine one result, even if (= beg end) +> + (,first-sym t)) +> + ;; We have to be careful if the region extends beyond the +> + ;; results. In this case, pos could be null or there could be +> + ;; no result at pos. +> + (while (and ,pos-sym (or (< ,pos-sym ,end-sym) ,first-sym)) +> + (when (notmuch-search-get-result ,pos-sym) +> + ,@body) +> + (setq ,pos-sym (notmuch-search-result-end ,pos-sym) +> + ,first-sym nil))))) +> + +> (defun notmuch-search-properties-in-region (property beg end) +> - (save-excursion +> - (let ((output nil) +> - (last-line (line-number-at-pos end)) +> - (max-line (- (line-number-at-pos (point-max)) 2))) +> - (goto-char beg) +> - (beginning-of-line) +> - (while (<= (line-number-at-pos) (min last-line max-line)) +> - (setq output (cons (get-text-property (point) property) output)) +> - (forward-line 1)) +> - output))) +> + (let (output) +> + (notmuch-search-do-results beg end pos +> + (push (get-text-property pos property) output)) +> + output)) +> +> (defun notmuch-search-find-thread-id () +> "Return the thread for the current thread" +> @@ -517,28 +533,19 @@ and will also appear in a buffer named \"*Notmuch errors*\"." +> (plist-get (notmuch-search-get-result pos) :tags)) +> +> (defun notmuch-search-get-tags-region (beg end) +> - (save-excursion +> - (let ((output nil) +> - (last-line (line-number-at-pos end)) +> - (max-line (- (line-number-at-pos (point-max)) 2))) +> - (goto-char beg) +> - (while (<= (line-number-at-pos) (min last-line max-line)) +> - (setq output (append output (notmuch-search-get-tags))) +> - (forward-line 1)) +> - output))) +> + (let (output) +> + (notmuch-search-do-results beg end pos +> + (setq output (append output (notmuch-search-get-tags pos)))) +> + output)) +> +> (defun notmuch-search-tag-region (beg end &optional tag-changes) +> "Change tags for threads in the given region." +> (let ((search-string (notmuch-search-find-thread-id-region-search beg end))) +> (setq tag-changes (funcall 'notmuch-tag search-string tag-changes)) +> - (save-excursion +> - (let ((last-line (line-number-at-pos end)) +> - (max-line (- (line-number-at-pos (point-max)) 2))) +> - (goto-char beg) +> - (while (<= (line-number-at-pos) (min last-line max-line)) +> - (notmuch-search-set-tags +> - (notmuch-update-tags (notmuch-search-get-tags) tag-changes)) +> - (forward-line)))))) +> + (notmuch-search-do-results beg end pos +> + (notmuch-search-set-tags +> + (notmuch-update-tags (notmuch-search-get-tags pos) tag-changes) +> + pos)))) +> +> (defun notmuch-search-tag (&optional tag-changes) +> "Change tags for the currently selected thread or region. +> -- +> 1.7.10