[PATCH v2 5/7] emacs: Replace other search text properties with result property

diff --git a/30/e934e55cdf7d2e114c424eebe694011fca24c8 b/30/e934e55cdf7d2e114c424eebe694011fca24c8
new file mode 100644 (file)
index 0000000..aab5ad1
--- /dev/null
+++ b/30/e934e55cdf7d2e114c424eebe694011fca24c8
@@ -0,0 +1,149 @@
+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 B52BF41ED7D\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 fC1f7uoRmuTw for <notmuch@notmuchmail.org>;\r
+       Fri, 13 Jul 2012 20:43:44 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1B265421192\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:40 -0700 (PDT)\r
+X-AuditID: 1209190f-b7f306d0000008b4-3a-5000eaebd701\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 63.93.02228.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 q6E3hcSd014753; \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 q6E3hbAK021331\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-0000a5-SV; Fri, 13 Jul 2012 23:43:36 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 5/7] emacs: Replace other search text properties with\r
+       result property\r
+Date: Fri, 13 Jul 2012 23:43:24 -0400\r
+Message-Id: <1342237406-32507-6-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+NgFtrDIsWRmVeSWpSXmKPExsUixG6novv6FUOAwZTJEhar5/JYXL85k9mB\r
+       yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgypjyfiV7wSvJio0vVrE1MF4U7WLk4JAQMJE4\r
+       doyxi5ETyBSTuHBvPVsXIxeHkMA+Rokdl+6yQzgbGCU2Nc2Ach4xSSy69ogZwpnLKDHnwnMW\r
+       kH42AQ2JbfuXg80SEZCW2Hl3NiuIzSzgKPF5/yI2EFtYIELi5d6tYDaLgKrEog0PwHp5BRwk\r
+       nh1aBXWHvMTT+31gNZxAvW29t8HiQgLlEte/rWGawMi/gJFhFaNsSm6Vbm5iZk5xarJucXJi\r
+       Xl5qka6JXm5miV5qSukmRlAgcUry72D8dlDpEKMAB6MSD2+GP0OAEGtiWXFl7iFGSQ4mJVFe\r
+       XmAYCvEl5adUZiQWZ8QXleakFh9ilOBgVhLhNW8DyvGmJFZWpRblw6SkOViUxHmvptz0FxJI\r
+       TyxJzU5NLUgtgsnKcHAoSfAKgwwVLEpNT61Iy8wpQUgzcXCCDOcBGi4NUsNbXJCYW5yZDpE/\r
+       xagoJc5rB5IQAElklObB9cIi/RWjONArwrw2IFU8wCQB1/0KaDAT0OBZP//5Aw0uSURISTUw\r
+       dnbNtDoqz5R5iiXcImbvjQ8TufUNVhg9kb0eY/2r9KDIi72Rnx6e890Y063bxv/wvruHauDm\r
+       NUz3DDn3TJA7/m/75uKw/SwHF2quNL19JPeoi07D+7mm/y4/mn6YRWz6fEdRNdnfYjV5th+O\r
+       lx7Oc9todeHoy16eraE749qqFn4OyV7ttlmqUomlOCPRUIu5qDgRAMTwXM7PAgAA\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
+Since the result object contains everything that the other text\r
+properties recorded, we can remove the other text properties and\r
+simply look in the plist of the appropriate result object.\r
+---\r
+ emacs/notmuch.el |   24 ++++++++++--------------\r
+ 1 file changed, 10 insertions(+), 14 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 92ba2c1..9e061b6 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -452,16 +452,18 @@ current result."\r
+ (defun notmuch-search-properties-in-region (property beg end)\r
+   (let (output)\r
+     (notmuch-search-do-results beg end pos\r
+-      (push (get-text-property pos property) output))\r
++      (push (plist-get (notmuch-search-get-result pos) property) output))\r
+     output))\r
+ \r
+ (defun notmuch-search-find-thread-id ()\r
+   "Return the thread for the current thread"\r
+-  (get-text-property (point) 'notmuch-search-thread-id))\r
++  (let ((thread (plist-get (notmuch-search-get-result) :thread)))\r
++    (when thread (concat "thread:" thread))))\r
+ \r
+ (defun notmuch-search-find-thread-id-region (beg end)\r
+   "Return a list of threads for the current region"\r
+-  (notmuch-search-properties-in-region 'notmuch-search-thread-id beg end))\r
++  (mapcar (lambda (thread) (concat "thread:" thread))\r
++        (notmuch-search-properties-in-region :thread beg end)))\r
+ \r
+ (defun notmuch-search-find-thread-id-region-search (beg end)\r
+   "Return a search string for threads for the current region"\r
+@@ -469,19 +471,19 @@ current result."\r
+ \r
+ (defun notmuch-search-find-authors ()\r
+   "Return the authors for the current thread"\r
+-  (get-text-property (point) 'notmuch-search-authors))\r
++  (plist-get (notmuch-search-get-result) :authors))\r
+ \r
+ (defun notmuch-search-find-authors-region (beg end)\r
+   "Return a list of authors for the current region"\r
+-  (notmuch-search-properties-in-region 'notmuch-search-authors beg end))\r
++  (notmuch-search-properties-in-region :authors beg end))\r
+ \r
+ (defun notmuch-search-find-subject ()\r
+   "Return the subject for the current thread"\r
+-  (get-text-property (point) 'notmuch-search-subject))\r
++  (plist-get (notmuch-search-get-result) :subject))\r
+ \r
+ (defun notmuch-search-find-subject-region (beg end)\r
+   "Return a list of authors for the current region"\r
+-  (notmuch-search-properties-in-region 'notmuch-search-subject beg end))\r
++  (notmuch-search-properties-in-region :subject beg end))\r
+ \r
+ (defun notmuch-search-show-thread ()\r
+   "Display the currently selected thread."\r
+@@ -774,13 +776,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
+-                         (plist-get result :authors))\r
+-      (put-text-property beg (point) 'notmuch-search-subject\r
+-                         (plist-get result :subject)))\r
++      (put-text-property beg (point) 'notmuch-search-result result))\r
+       (when (string= (plist-get result :thread) notmuch-search-target-thread)\r
+       (setq notmuch-search-target-thread "found")\r
+       (goto-char beg)))))\r
+-- \r
+1.7.10\r
+\r