[PATCH v2 1/7] emacs: Record thread search result object in a text property

diff --git a/09/3ffbe63e9152f43393e66952af9af00b19edd9 b/09/3ffbe63e9152f43393e66952af9af00b19edd9
new file mode 100644 (file)
index 0000000..b9dd4f7
--- /dev/null
+++ b/09/3ffbe63e9152f43393e66952af9af00b19edd9
@@ -0,0 +1,128 @@
+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 2C5B941ED7F\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:46 -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 IK4Z-+9ZEN2U for <notmuch@notmuchmail.org>;\r
+       Fri, 13 Jul 2012 20:43:45 -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 3A295421197\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:40 -0700 (PDT)\r
+X-AuditID: 1209190d-b7fd56d000000933-f8-5000eaeb0098\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id C5.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-2.mit.edu (8.13.8/8.9.2) with ESMTP id q6E3hcg3014751; \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 q6E3ha8w021323\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-0000Zv-KO; Fri, 13 Jul 2012 23:43:36 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/7] emacs: Record thread search result object in a text\r
+       property\r
+Date: Fri, 13 Jul 2012 23:43:20 -0400\r
+Message-Id: <1342237406-32507-2-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+NgFtrNIsWRmVeSWpSXmKPExsUixG6novv6FUOAwcpL4har5/JYXL85k9mB\r
+       yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyuhZ/JCtYJVgxYxt11gbGGfydTFycEgImEg8\r
+       PKrfxcgJZIpJXLi3ng3EFhLYxyjRcd6hi5ELyN7AKHFvTg8rhPOISaL//2tGCGcuo8T2DX9Y\r
+       QVrYBDQktu1fzghiiwhIS+y8OxsszizgKPF5/yKwscICIRIbW3eC2SwCqhIT505kArF5BRwk\r
+       Pr3qYoU4Q17i6f0+sBpOoN623tuMECeVS1z/toZpAiP/AkaGVYyyKblVurmJmTnFqcm6xcmJ\r
+       eXmpRbpGermZJXqpKaWbGEFhxCnJu4Px3UGlQ4wCHIxKPLyp/gwBQqyJZcWVuYcYJTmYlER5\r
+       eYFBKMSXlJ9SmZFYnBFfVJqTWnyIUYKDWUmE17wNKMebklhZlVqUD5OS5mBREue9knLTX0gg\r
+       PbEkNTs1tSC1CCYrw8GhJMErDDJUsCg1PbUiLTOnBCHNxMEJMpwHaLg0SA1vcUFibnFmOkT+\r
+       FKOilDjv5ZdACQGQREZpHlwvLM5fMYoDvSLMawPSzgNMEXDdr4AGMwENnvXznz/Q4JJEhJRU\r
+       A2P6pcaVmxxYEjbkCjbvD7XaF3S9YPnule8Y72+o9mOID73QfFjKv/PC6p3Jm9ee4vBwUKn5\r
+       K6lhkHmCWbsxSmvak6Mx2QI+y1/cPtS4OPxs8LG6pcnXp9g/cJ36kqF454qIXg+rhen/368O\r
+       O6rLNHeV6es9y210eua9Ly6Zpq3rt35O/oM/HRlKLMUZiYZazEXFiQCWg4NhzgIAAA==\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:46 -0000\r
+\r
+This also provides utility functions for working with this text\r
+property that get its value, find its start, and find its end.\r
+---\r
+ emacs/notmuch.el |   27 +++++++++++++++++++++++++++\r
+ 1 file changed, 27 insertions(+)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index fabb7c0..ef18927 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -401,6 +401,32 @@ Complete list of currently available key bindings:\r
+       mode-name "notmuch-search")\r
+   (setq buffer-read-only t))\r
+ \r
++(defun notmuch-search-get-result (&optional pos)\r
++  "Return the result object for the thread at POS (or point).\r
++\r
++If there is no thread at POS (or point), returns nil."\r
++  (get-text-property (or pos (point)) 'notmuch-search-result))\r
++\r
++(defun notmuch-search-result-beginning (&optional pos)\r
++  "Return the point at the beginning of the thread at POS (or point).\r
++\r
++If there is no thread at POS (or point), returns nil."\r
++  (when (notmuch-search-get-result pos)\r
++    ;; We pass 1+point because previous-single-property-change starts\r
++    ;; searching one before the position we give it.\r
++    (previous-single-property-change (1+ (or pos (point)))\r
++                                   'notmuch-search-result nil (point-min))))\r
++\r
++(defun notmuch-search-result-end (&optional pos)\r
++  "Return the point at the end of the thread at POS (or point).\r
++\r
++The returned point will be just after the newline character that\r
++ends the result line.  If there is no thread at POS (or point),\r
++returns nil"\r
++  (when (notmuch-search-get-result pos)\r
++    (next-single-property-change (or pos (point)) 'notmuch-search-result\r
++                               nil (point-max))))\r
++\r
+ (defun notmuch-search-properties-in-region (property beg end)\r
+   (save-excursion\r
+     (let ((output nil)\r
+@@ -736,6 +762,7 @@ non-authors is found, assume that all of the authors match."\r
+         (notmuch-search-insert-field (car spec) (cdr spec) result))\r
+       (insert "\n")\r
+       (notmuch-search-color-line beg (point) (plist-get result :tags))\r
++      (put-text-property beg (point) 'notmuch-search-result result)\r
+       (put-text-property beg (point) 'notmuch-search-thread-id\r
+                          (concat "thread:" (plist-get result :thread)))\r
+       (put-text-property beg (point) 'notmuch-search-authors\r
+-- \r
+1.7.10\r
+\r