From a282c48dd9f9e7f72323b973ff1bc105fc987ac2 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sat, 14 Jul 2012 23:43:22 +2000 Subject: [PATCH] [PATCH v2 3/7] emacs: Update tags by rewriting the search result line in place --- 13/f7414a0a80454f32f95e5e1e399173f99b1111 | 174 ++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 13/f7414a0a80454f32f95e5e1e399173f99b1111 diff --git a/13/f7414a0a80454f32f95e5e1e399173f99b1111 b/13/f7414a0a80454f32f95e5e1e399173f99b1111 new file mode 100644 index 000000000..623b4a845 --- /dev/null +++ b/13/f7414a0a80454f32f95e5e1e399173f99b1111 @@ -0,0 +1,174 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 145E841ED71 + for ; Fri, 13 Jul 2012 20:43:43 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id ygLRCxbalFRJ for ; + Fri, 13 Jul 2012 20:43:41 -0700 (PDT) +Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU + [18.7.68.37]) + by olra.theworths.org (Postfix) with ESMTP id D0EA0429E42 + for ; Fri, 13 Jul 2012 20:43:39 -0700 (PDT) +X-AuditID: 12074425-b7f9b6d0000008c4-8f-5000eaeb94a3 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id 0B.AD.02244.BEAE0005; Fri, 13 Jul 2012 23:43:39 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q6E3hcro014752; + Fri, 13 Jul 2012 23:43:38 -0400 +Received: from drake.dyndns.org + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6E3hbfB021327 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Fri, 13 Jul 2012 23:43:38 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1SptGa-0000Zz-Ol; Fri, 13 Jul 2012 23:43:36 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 3/7] emacs: Update tags by rewriting the search result line + in place +Date: Fri, 13 Jul 2012 23:43:22 -0400 +Message-Id: <1342237406-32507-4-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1342237406-32507-1-git-send-email-amdragon@mit.edu> +References: <1342140319-19859-1-git-send-email-amdragon@mit.edu> + <1342237406-32507-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixG6novv6FUOAwZsdYhar5/JYXL85k9mB + yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgynh8VbrgsVxF08XABsZrEl2MnBwSAiYStzZ9 + ZoKwxSQu3FvP1sXIxSEksI9R4sHsWywQzgZGieZXnxkhnEdMEu8vzYRy5jJKbJ9+hw2kn01A + Q2Lb/uWMILaIgLTEzruzWUFsZgFHic/7F4HVCAuES+yceZ+5i5GDg0VAVeJcdypImFfAQWJW + 9wd2iDPkJZ7e7wMr5wRqbeu9DTZSSKBc4vq3NUwTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7M + y0st0rXQy80s0UtNKd3ECA4iF9UdjBMOKR1iFOBgVOLhTfRnCBBiTSwrrsw9xCjJwaQkyssL + DEEhvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIrzmbUA53pTEyqrUonyYlDQHi5I4742Um/5CAumJ + JanZqakFqUUwWRkODiUJXmGQoYJFqempFWmZOSUIaSYOTpDhPEDDpUFqeIsLEnOLM9Mh8qcY + FaXEee1AEgIgiYzSPLheWJS/YhQHekWY1wakigeYIOC6XwENZgIaPOvnP3+gwSWJCCmpBkbP + SwYns3Z7h2ue22xyW/3RxJK4kl0rHybOmdLA+erB6x2vfxvv/6leHXf9/CL5DXyrElOedHXp + 8F26prsxe27UtBsCScsSJx+20Mz4e8XwXFWMxbtbr56ZfDuplqPpnDxH/3Jq/g0Z/jW5uuGn + k6O3Ca4w/3P2oeavhY/D9HMVrqQu+mUks8lTiaU4I9FQi7moOBEAiF8dQ80CAAA= +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 14 Jul 2012 03:43:43 -0000 + +Now that we keep the full thread result object, we can refresh a +result after any changes by simply deleting and reconstructing the +result line from scratch. + +A convenient side-effect of this wholesale replacement is that search +now re-applies notmuch-search-line-faces when tags change. +--- + emacs/notmuch.el | 60 ++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 36 insertions(+), 24 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 82c148d..8e1a769 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -509,28 +509,12 @@ and will also appear in a buffer named \"*Notmuch errors*\"." + (error (buffer-substring beg end)) + )))))) + +-(defun notmuch-search-set-tags (tags) +- (save-excursion +- (end-of-line) +- (re-search-backward "(") +- (forward-char) +- (let ((beg (point)) +- (inhibit-read-only t)) +- (re-search-forward ")") +- (backward-char) +- (let ((end (point))) +- (delete-region beg end) +- (insert (propertize (mapconcat 'identity tags " ") +- 'face 'notmuch-tag-face)))))) +- +-(defun notmuch-search-get-tags () +- (save-excursion +- (end-of-line) +- (re-search-backward "(") +- (let ((beg (+ (point) 1))) +- (re-search-forward ")") +- (let ((end (- (point) 1))) +- (split-string (buffer-substring-no-properties beg end)))))) ++(defun notmuch-search-set-tags (tags &optional pos) ++ (let ((new-result (plist-put (notmuch-search-get-result pos) :tags tags))) ++ (notmuch-search-update-result new-result pos))) ++ ++(defun notmuch-search-get-tags (&optional pos) ++ (plist-get (notmuch-search-get-result pos) :tags)) + + (defun notmuch-search-get-tags-region (beg end) + (save-excursion +@@ -583,6 +567,33 @@ This function advances the next thread when finished." + (notmuch-search-tag '("-inbox")) + (notmuch-search-next-thread)) + ++(defun notmuch-search-update-result (result &optional pos) ++ "Replace the result object of the thread at POS (or point) by ++RESULT and redraw it." ++ (let ((start (notmuch-search-result-beginning pos)) ++ (end (notmuch-search-result-end pos)) ++ (init-point (point)) ++ (init-start (window-start)) ++ (inhibit-read-only t)) ++ ;; Delete the current thread ++ (delete-region start end) ++ ;; Insert the updated thread ++ (notmuch-search-show-result result start) ++ ;; There may have been markers pointing into the text we just ++ ;; replaced. For the most part, there's nothing we can do about ++ ;; this, but we can fix markers that were at point (which includes ++ ;; point itself and any save-excursions for which point hasn't ++ ;; moved) by re-inserting the text that should come before point ++ ;; before markers. ++ (when (and (>= init-point start) (<= init-point end)) ++ (let* ((new-end (notmuch-search-result-end start)) ++ (new-point (if (= init-point end) ++ new-end ++ (min init-point (- new-end 1))))) ++ (insert-before-markers (delete-and-extract-region start new-point)))) ++ ;; We also may have shifted the window scroll. Fix it. ++ (set-window-start (selected-window) init-start))) ++ + (defun notmuch-search-process-sentinel (proc msg) + "Add a message to let user know when \"notmuch search\" exits" + (let ((buffer (process-buffer proc)) +@@ -745,10 +756,11 @@ non-authors is found, assume that all of the authors match." + (mapconcat 'identity (plist-get result :tags) " ") + 'font-lock-face 'notmuch-tag-face) ")"))))) + +-(defun notmuch-search-show-result (result) ++(defun notmuch-search-show-result (result &optional pos) ++ "Insert RESULT at POS or the end of the buffer if POS is null." + ;; Ignore excluded matches + (unless (= (plist-get result :matched) 0) +- (let ((beg (point-max))) ++ (let ((beg (or pos (point-max)))) + (save-excursion + (goto-char beg) + (dolist (spec notmuch-search-result-format) +-- +1.7.10 + -- 2.26.2