--- /dev/null
+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 016B841ED7D\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:45 -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 U1+YxoQzYFiy for <notmuch@notmuchmail.org>;\r
+ Fri, 13 Jul 2012 20:43:42 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+ [18.9.25.13])\r
+ by olra.theworths.org (Postfix) with ESMTP id EC362421163\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:39 -0700 (PDT)\r
+X-AuditID: 1209190d-b7fd56d000000933-f7-5000eaeb3535\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 75.89.02355.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-1.mit.edu (8.13.8/8.9.2) with ESMTP id q6E3hcIW029858; \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 q6E3hbqA021330\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-0000a2-Qa; Fri, 13 Jul 2012 23:43:36 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 4/7] emacs: Use result text properties for search result\r
+ iteration\r
+Date: Fri, 13 Jul 2012 23:43:23 -0400\r
+Message-Id: <1342237406-32507-5-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+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrPv6FUOAwZGPPBar5/JYXL85k9mB\r
+ yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgylgz4yRbwSGFigNTFrA2ME6S6mLk5JAQMJE4\r
+ PHsNK4QtJnHh3nq2LkYuDiGBfYwSHV9msEM4GxglPr2dwwrhPGKS2NZ/A8qZyyixtPsKO0g/\r
+ m4CGxLb9yxlBbBEBaYmdd2eDzWUWcJT4vH8RG4gtLBAq8fXCDDCbRUBVYmfnIbBeXgEHiWtN\r
+ i1gg7pCXeHq/D6yGE6i3rfc22EwhgXKJ69/WME1g5F/AyLCKUTYlt0o3NzEzpzg1Wbc4OTEv\r
+ L7VI10gvN7NELzWldBMjOJQkeXcwvjuodIhRgINRiYc31Z8hQIg1say4MvcQoyQHk5IoLy8w\r
+ EIX4kvJTKjMSizPii0pzUosPMUpwMCuJ8Jq3AeV4UxIrq1KL8mFS0hwsSuK8V1Ju+gsJpCeW\r
+ pGanphakFsFkZTg4lCR4hUGGChalpqdWpGXmlCCkmTg4QYbzAA2XBqnhLS5IzC3OTIfIn2JU\r
+ lBLnvfwSKCEAksgozYPrhcX6K0ZxoFeEeW1A2nmAaQKu+xXQYCagwbN+/vMHGlySiJCSamD0\r
+ PtXabXji4lmX725RfCvZzEq1G82M4nOXqd7690A85qzVE9VJEkvta15mXrT0dO6M7D25qVPK\r
+ UODVVqnZlzMm6+/exmXwgNmP+WTvz5YYC17ZHy8F725tn1buvt5ioszzv4Wt8nfZDT6YPjHc\r
+ vmhFxiSLZQLPclbOiGe1LWld5f6qefuh5bxKLMUZiYZazEXFiQByvzDB0AIAAA==\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:45 -0000\r
+\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
+ 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
+\r
projects / notmuch-archives.git / commitdiff