--- /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 A02C1429E3F\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Jul 2012 16:02:29 -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 K0jOF6+FBmJ5 for <notmuch@notmuchmail.org>;\r
+ Sat, 14 Jul 2012 16:02:28 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id CA017431E84\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Jul 2012 16:02:26 -0700 (PDT)\r
+X-AuditID: 12074425-b7f9b6d0000008c4-b5-5001fa82ea7e\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id AC.00.02244.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-4.mit.edu (8.13.8/8.9.2) with ESMTP id q6EN2Pti010943; \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 q6EN2O0a008496\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 14 Jul 2012 19:02:24 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SqBLz-0002GA-Tc; Sat, 14 Jul 2012 19:02:23 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 4/8] emacs: Use result text properties for search result\r
+ iteration\r
+Date: Sat, 14 Jul 2012 19:02:16 -0400\r
+Message-Id: <1342306940-7499-5-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+NgFjrKIsWRmVeSWpSXmKPExsUixG6nrtv0izHAYMU5KYs9+7wsVs/lsbh+\r
+ cyazA7PH3dNcHjtn3WX3eLbqFnMAcxSXTUpqTmZZapG+XQJXxt/m/0wFMzQq5pw8w9rAuE2h\r
+ i5GTQ0LARKJ9eg8ThC0mceHeerYuRi4OIYF9jBL9F95CORsYJTa272SHcB4xSfS3bIDKzGWU\r
+ OLFnBQtIP5uAhsS2/csZQWwRAWmJnXdns4LYzAJpEt/b34LFhQVCJfY/uAG2j0VAVeLC7W9s\r
+ IDavgL3Ek3MX2SHukJd4er8PLM4p4CBx+MIJsDlCAmUSN558Z53AyL+AkWEVo2xKbpVubmJm\r
+ TnFqsm5xcmJeXmqRroVebmaJXmpK6SZGcGi5qO5gnHBI6RCjAAejEg9voj9DgBBrYllxZe4h\r
+ RkkOJiVR3s1fGQOE+JLyUyozEosz4otKc1KLDzFKcDArifBKgOR4UxIrq1KL8mFS0hwsSuK8\r
+ N1Ju+gsJpCeWpGanphakFsFkZTg4lCR4C38CNQoWpaanVqRl5pQgpJk4OEGG8wAN7wap4S0u\r
+ SMwtzkyHyJ9iVJQS5+0FSQiAJDJK8+B6YbH/ilEc6BVh3qUgVTzAtAHX/QpoMBPQ4Fk///kD\r
+ DS5JREhJNTBuZO9hMfzv3bEt4/rbibf9b8i8368YlbfhDk/dHAnnuNVfdRbt42uxVZiRavDm\r
+ /a94tdmy50o7XSLf7ta6LOA+/8wWlmNHv94yWS14hkljel+KWobeSj2h+MNW076+Mi2qL1wX\r
+ b7to+ekrx0q1/paGMeQcOfqowksuLWT52fzuhPRpUz8ff2GoxFKckWioxVxUnAgAedu6V9gC AAA=\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:29 -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 for interactive navigation.\r
+---\r
+ emacs/notmuch.el | 78 ++++++++++++++++++++++++++++++++++--------------------\r
+ 1 file changed, 50 insertions(+), 28 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 8e1a769..49367e0 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -69,7 +69,13 @@\r
+ date, count, authors, subject, tags\r
+ For example:\r
+ (setq notmuch-search-result-format \(\(\"authors\" . \"%-40s\"\)\r
+- \(\"subject\" . \"%s\"\)\)\)"\r
++ \(\"subject\" . \"%s\"\)\)\)\r
++Line breaks are permitted in format strings. Note that a line\r
++break at the end of an \"authors\" field will get elided if the\r
++authors list is long; place it instead at the beginning of the\r
++following field. To enter a line break when setting this\r
++variable with setq, use \\n. To enter a line break in customize,\r
++press \\[quoted-insert] C-j."\r
+ :type '(alist :key-type (string) :value-type (string))\r
+ :group 'notmuch-search)\r
+ \r
+@@ -427,17 +433,40 @@ returns nil"\r
+ (next-single-property-change (or pos (point)) 'notmuch-search-result\r
+ nil (point-max))))\r
+ \r
++(defun notmuch-search-foreach-result (beg end function)\r
++ "Invoke FUNCTION for each result between BEG and END.\r
++\r
++FUNCTION should take one argument. It will be applied to the\r
++character position of the beginning of each result that overlaps\r
++the region between points BEG and END. As a special case, if (=\r
++BEG END), FUNCTION will be applied to the result containing point\r
++BEG."\r
++\r
++ (lexical-let ((pos (notmuch-search-result-beginning beg))\r
++ ;; End must be a marker in case function changes the\r
++ ;; text.\r
++ (end (copy-marker end))\r
++ ;; Make sure we examine at least one result, even if\r
++ ;; (= beg end).\r
++ (first t))\r
++ ;; We have to be careful if the region extends beyond the results.\r
++ ;; In this case, pos could be null or there could be no result at\r
++ ;; pos.\r
++ (while (and pos (or (< pos end) first))\r
++ (when (notmuch-search-get-result pos)\r
++ (funcall function pos))\r
++ (setq pos (notmuch-search-result-end pos)\r
++ first nil))))\r
++;; Unindent the function argument of notmuch-search-foreach-result so\r
++;; the indentation of callers doesn't get out of hand.\r
++(put 'notmuch-search-foreach-result 'lisp-indent-function 2)\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-foreach-result beg end\r
++ (lambda (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 +546,21 @@ 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-foreach-result beg end\r
++ (lambda (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-foreach-result beg end\r
++ (lambda (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