From: Austin Clements Date: Sat, 14 Jul 2012 23:02:15 +0000 (+2000) Subject: [PATCH v3 3/8] emacs: Update tags by rewriting the search result line in place X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c645d6e8aca75af8e53f99160bc527dfd39d522e;p=notmuch-archives.git [PATCH v3 3/8] emacs: Update tags by rewriting the search result line in place --- diff --git a/70/ac05378866f4ad2ade3e641eecd3aac3141005 b/70/ac05378866f4ad2ade3e641eecd3aac3141005 new file mode 100644 index 000000000..62bf4c071 --- /dev/null +++ b/70/ac05378866f4ad2ade3e641eecd3aac3141005 @@ -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 064CA429E29 + for ; Sat, 14 Jul 2012 16:02:33 -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 Mha1YR3XyfKz for ; + Sat, 14 Jul 2012 16:02:31 -0700 (PDT) +Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU + [18.7.68.35]) + by olra.theworths.org (Postfix) with ESMTP id 3744D429E2F + for ; Sat, 14 Jul 2012 16:02:27 -0700 (PDT) +X-AuditID: 12074423-b7f396d0000008f4-d8-5001fa823436 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP + id 95.26.02292.28AF1005; Sat, 14 Jul 2012 19:02:26 -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 q6EN2PN0031812; + Sat, 14 Jul 2012 19:02:25 -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 q6EN2OXq008495 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sat, 14 Jul 2012 19:02:24 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1SqBLz-0002G7-Re; Sat, 14 Jul 2012 19:02:23 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v3 3/8] emacs: Update tags by rewriting the search result line + in place +Date: Sat, 14 Jul 2012 19:02:15 -0400 +Message-Id: <1342306940-7499-4-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1342306940-7499-1-git-send-email-amdragon@mit.edu> +References: <1342140319-19859-1-git-send-email-amdragon@mit.edu> + <1342306940-7499-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsUixG6notv0izHA4OxEHos9+7wsVs/lsbh+ + cyazA7PH3dNcHjtn3WX3eLbqFnMAcxSXTUpqTmZZapG+XQJXxuOr0gWP5SqaLgY2MF6T6GLk + 5JAQMJHY2d7FDmGLSVy4t56ti5GLQ0hgH6PE//9LWCCcDYwS+zt+MIJUCQk8YpJ4NdUbIjGX + UWL32kVMIAk2AQ2JbfuXgxWJCEhL7Lw7mxXEZhZIk/je/hYsLiwQLnHo+nk2EJtFQFXi95yj + YDavgL3E18sbmSHOkJd4er8PLM4p4CBx+MIJVojFZRI3nnxnncDIv4CRYRWjbEpulW5uYmZO + cWqybnFyYl5eapGumV5uZoleakrpJkZwULko72D8c1DpEKMAB6MSD2+SP0OAEGtiWXFl7iFG + SQ4mJVHe1z8ZA4T4kvJTKjMSizPii0pzUosPMUpwMCuJ8Ep8BcrxpiRWVqUW5cOkpDlYlMR5 + r6Xc9BcSSE8sSc1OTS1ILYLJynBwKEnwvgIZKliUmp5akZaZU4KQZuLgBBnOAzT8JEgNb3FB + Ym5xZjpE/hSjopQ4REIAJJFRmgfXC4v6V4ziQK8I8z4EqeIBJgy47ldAg5mABs/6+c8faHBJ + IkJKqoFROkbrvd6NKHHuvyUFrvbPum6WTL9aET1zKoubh1pYyWIu4yWfzk21Wftgy8EU9apy + Td+Pq5MuthUvfBjOfqyS+bOx3OnTPuuTDm3x/PL/pNHt4oiDoSvfhV58svik0IefB1SzeA9r + /VAz2qpuylVyr+fWeT/vk0u4uO3Petnvss4KEHWZzfZQiaU4I9FQi7moOBEA/dTr8dUCAAA= +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 23:02:33 -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 +