--- /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 1681C431FB6\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 11:33:33 -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 eAEQvN5cmui0 for <notmuch@notmuchmail.org>;\r
+ Fri, 13 Jul 2012 11:33:31 -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 504AE431FAE\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 11:33:31 -0700 (PDT)\r
+X-AuditID: 1209190d-b7fd56d000000933-a4-500069fa3b63\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 EB.C9.02355.AF960005; Fri, 13 Jul 2012 14:33:30 -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 q6DIXUet026676; \r
+ Fri, 13 Jul 2012 14:33:30 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (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 q6DIXS13018093\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Fri, 13 Jul 2012 14:33:29 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SpkgC-0008BS-Km; Fri, 13 Jul 2012 14:33:28 -0400\r
+Date: Fri, 13 Jul 2012 14:33:28 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Subject: Re: [PATCH 3/7] emacs: Update tags by rewriting the search result\r
+ line in place\r
+Message-ID: <20120713183328.GA31182@mit.edu>\r
+References: <1342140319-19859-1-git-send-email-amdragon@mit.edu>\r
+ <1342140319-19859-4-git-send-email-amdragon@mit.edu>\r
+ <87a9z38ryo.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <87a9z38ryo.fsf@qmul.ac.uk>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpkleLIzCtJLcpLzFFi42IRYrdT0f2dyRBgcJvNYvVcHovrN2cyOzB5\r
+ 7Jx1l93j2apbzAFMUVw2Kak5mWWpRfp2CVwZJw5/Yi/4r1Hx58gd9gbGZ/JdjJwcEgImElea\r
+ etggbDGJC/fWA9lcHEIC+xglJlzcwgjhbGCUeLX7MTuEc5JJYuGLv8wgLUICSxglTqwVBbFZ\r
+ BFQlLi19zgpiswloSGzbv5wRxBYR0JG4fWgBO4jNLCAt8e13MxOILSwQJbHvyjWgORwcvEA1\r
+ 7bulIOZPZZTou3KcBaSGV0BQ4uTMJywQvVoSN/69ZAKpB5mz/B8HSJgTaNWljklgH4gKqEhM\r
+ ObmNbQKj0Cwk3bOQdM9C6F7AyLyKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI10gvN7NELzWldBMj\r
+ KKQ5JXl3ML47qHSIUYCDUYmHN9WfIUCINbGsuDL3EKMkB5OSKO/eVKAQX1J+SmVGYnFGfFFp\r
+ TmrxIUYJDmYlEV4dY6Acb0piZVVqUT5MSpqDRUmc90rKTX8hgfTEktTs1NSC1CKYrAwHh5IE\r
+ LzswdoUEi1LTUyvSMnNKENJMHJwgw3mAhpuC1PAWFyTmFmemQ+RPMSpKiUM0C4AkMkrz4Hph\r
+ KecVozjQK8K8vzOAqniA6Qqu+xXQYCagwbN+/vMHGlySiJCSamCc3Rud2Wnn9dVYN1npTU1Q\r
+ +Ht7t3iWxye5ko+6v6q0Et4UIXxglwC3SqvG5KzrvOdtWdf++lfrsv5llYoX/77HR9ZMEN5x\r
+ RKIyeHa8yZs3G5d8NJr5kGG76drbnzOYxFb1Gii3iLFOU5EvyLMt4qtdYC2o9eC8XraH4c+1\r
+ EzpOPdpVyP97cpQSS3FGoqEWc1FxIgCG7WFDFAMAAA==\r
+Cc: notmuch@notmuchmail.org\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: Fri, 13 Jul 2012 18:33:33 -0000\r
+\r
+Quoth Mark Walters on Jul 13 at 6:57 pm:\r
+> On Fri, 13 Jul 2012, Austin Clements <amdragon@MIT.EDU> wrote:\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 | 55 ++++++++++++++++++++++++++++++------------------------\r
+> > 1 file changed, 31 insertions(+), 24 deletions(-)\r
+> >\r
+> > diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> > index 82c148d..2f83425 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,29 @@ 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
+> > + "Update the result object of the current thread and redraw it."\r
+> \r
+> I think this comment reads a little awkwardly. Maybe "Replace the result\r
+> object of the current thread by RESULT and redraw it"?\r
+\r
+Better. I should also say that it's the thread at POS (or point).\r
+\r
+> > + (let ((start (notmuch-search-result-beginning pos))\r
+> > + (end (notmuch-search-result-end pos))\r
+> > + (init-point (point))\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
+> \r
+> I think this doesn't always do quite the right thing with multiline\r
+> results: the one that I can reproduce reliably is if you are on the\r
+> second line of the first result, and the first line of this result is\r
+> the first visible line in the window, and update it (eg by marking\r
+> unread) then the window scrolls so that the second line of the first\r
+> result is the first line visible in the window (ie the window scrolls up\r
+> one line)\r
+\r
+Nice catch! I really wish Emacs had a "replace text" function that\r
+did sane things with markers and the window position and such; without\r
+that anything I do is going to be finicky. I'll see if saving and\r
+restoring the window scroll position fixes this.\r
+\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 +752,10 @@ 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
+> \r
+> \r
+> Perhaps a documentation line? along the lines of Insert RESULT in buffer\r
+> at POS or the end of buffer.\r
+\r
+Good idea.\r
+\r
+> Best wishes\r
+> \r
+> Mark\r
+> \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
projects / notmuch-archives.git / commitdiff