--- /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 145E841ED71\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:43 -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 ygLRCxbalFRJ for <notmuch@notmuchmail.org>;\r
+ Fri, 13 Jul 2012 20:43:41 -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 D0EA0429E42\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:39 -0700 (PDT)\r
+X-AuditID: 12074425-b7f9b6d0000008c4-8f-5000eaeb94a3\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 0B.AD.02244.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 q6E3hcro014752; \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 q6E3hbfB021327\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-0000Zz-Ol; Fri, 13 Jul 2012 23:43:36 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/7] emacs: Update tags by rewriting the search result line\r
+ in place\r
+Date: Fri, 13 Jul 2012 23:43:22 -0400\r
+Message-Id: <1342237406-32507-4-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+NgFtrFIsWRmVeSWpSXmKPExsUixG6novv6FUOAwZsdYhar5/JYXL85k9mB\r
+ yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgynh8VbrgsVxF08XABsZrEl2MnBwSAiYStzZ9\r
+ ZoKwxSQu3FvP1sXIxSEksI9R4sHsWywQzgZGieZXnxkhnEdMEu8vzYRy5jJKbJ9+hw2kn01A\r
+ Q2Lb/uWMILaIgLTEzruzWUFsZgFHic/7F4HVCAuES+yceZ+5i5GDg0VAVeJcdypImFfAQWJW\r
+ 9wd2iDPkJZ7e7wMr5wRqbeu9DTZSSKBc4vq3NUwTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7M\r
+ y0st0rXQy80s0UtNKd3ECA4iF9UdjBMOKR1iFOBgVOLhTfRnCBBiTSwrrsw9xCjJwaQkyssL\r
+ DEEhvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIrzmbUA53pTEyqrUonyYlDQHi5I4742Um/5CAumJ\r
+ JanZqakFqUUwWRkODiUJXmGQoYJFqempFWmZOSUIaSYOTpDhPEDDpUFqeIsLEnOLM9Mh8qcY\r
+ FaXEee1AEgIgiYzSPLheWJS/YhQHekWY1wakigeYIOC6XwENZgIaPOvnP3+gwSWJCCmpBkbP\r
+ SwYns3Z7h2ue22xyW/3RxJK4kl0rHybOmdLA+erB6x2vfxvv/6leHXf9/CL5DXyrElOedHXp\r
+ 8F26prsxe27UtBsCScsSJx+20Mz4e8XwXFWMxbtbr56ZfDuplqPpnDxH/3Jq/g0Z/jW5uuGn\r
+ k6O3Ca4w/3P2oeavhY/D9HMVrqQu+mUks8lTiaU4I9FQi7moOBEAiF8dQ80CAAA=\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:43 -0000\r
+\r
+Now that we keep the full thread result object, we can refresh a\r
+result after any changes by simply deleting and reconstructing the\r
+result line from scratch.\r
+\r
+A convenient side-effect of this wholesale replacement is that search\r
+now re-applies notmuch-search-line-faces when tags change.\r
+---\r
+ emacs/notmuch.el | 60 ++++++++++++++++++++++++++++++++----------------------\r
+ 1 file changed, 36 insertions(+), 24 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 82c148d..8e1a769 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -509,28 +509,12 @@ and will also appear in a buffer named \"*Notmuch errors*\"."\r
+ (error (buffer-substring beg end))\r
+ ))))))\r
+ \r
+-(defun notmuch-search-set-tags (tags)\r
+- (save-excursion\r
+- (end-of-line)\r
+- (re-search-backward "(")\r
+- (forward-char)\r
+- (let ((beg (point))\r
+- (inhibit-read-only t))\r
+- (re-search-forward ")")\r
+- (backward-char)\r
+- (let ((end (point)))\r
+- (delete-region beg end)\r
+- (insert (propertize (mapconcat 'identity tags " ")\r
+- 'face 'notmuch-tag-face))))))\r
+-\r
+-(defun notmuch-search-get-tags ()\r
+- (save-excursion\r
+- (end-of-line)\r
+- (re-search-backward "(")\r
+- (let ((beg (+ (point) 1)))\r
+- (re-search-forward ")")\r
+- (let ((end (- (point) 1)))\r
+- (split-string (buffer-substring-no-properties beg end))))))\r
++(defun notmuch-search-set-tags (tags &optional pos)\r
++ (let ((new-result (plist-put (notmuch-search-get-result pos) :tags tags)))\r
++ (notmuch-search-update-result new-result pos)))\r
++\r
++(defun notmuch-search-get-tags (&optional pos)\r
++ (plist-get (notmuch-search-get-result pos) :tags))\r
+ \r
+ (defun notmuch-search-get-tags-region (beg end)\r
+ (save-excursion\r
+@@ -583,6 +567,33 @@ This function advances the next thread when finished."\r
+ (notmuch-search-tag '("-inbox"))\r
+ (notmuch-search-next-thread))\r
+ \r
++(defun notmuch-search-update-result (result &optional pos)\r
++ "Replace the result object of the thread at POS (or point) by\r
++RESULT and redraw it."\r
++ (let ((start (notmuch-search-result-beginning pos))\r
++ (end (notmuch-search-result-end pos))\r
++ (init-point (point))\r
++ (init-start (window-start))\r
++ (inhibit-read-only t))\r
++ ;; Delete the current thread\r
++ (delete-region start end)\r
++ ;; Insert the updated thread\r
++ (notmuch-search-show-result result start)\r
++ ;; There may have been markers pointing into the text we just\r
++ ;; replaced. For the most part, there's nothing we can do about\r
++ ;; this, but we can fix markers that were at point (which includes\r
++ ;; point itself and any save-excursions for which point hasn't\r
++ ;; moved) by re-inserting the text that should come before point\r
++ ;; before markers.\r
++ (when (and (>= init-point start) (<= init-point end))\r
++ (let* ((new-end (notmuch-search-result-end start))\r
++ (new-point (if (= init-point end)\r
++ new-end\r
++ (min init-point (- new-end 1)))))\r
++ (insert-before-markers (delete-and-extract-region start new-point))))\r
++ ;; We also may have shifted the window scroll. Fix it.\r
++ (set-window-start (selected-window) init-start)))\r
++\r
+ (defun notmuch-search-process-sentinel (proc msg)\r
+ "Add a message to let user know when \"notmuch search\" exits"\r
+ (let ((buffer (process-buffer proc))\r
+@@ -745,10 +756,11 @@ non-authors is found, assume that all of the authors match."\r
+ (mapconcat 'identity (plist-get result :tags) " ")\r
+ 'font-lock-face 'notmuch-tag-face) ")")))))\r
+ \r
+-(defun notmuch-search-show-result (result)\r
++(defun notmuch-search-show-result (result &optional pos)\r
++ "Insert RESULT at POS or the end of the buffer if POS is null."\r
+ ;; Ignore excluded matches\r
+ (unless (= (plist-get result :matched) 0)\r
+- (let ((beg (point-max)))\r
++ (let ((beg (or pos (point-max))))\r
+ (save-excursion\r
+ (goto-char beg)\r
+ (dolist (spec notmuch-search-result-format)\r
+-- \r
+1.7.10\r
+\r
projects / notmuch-archives.git / commitdiff