[PATCH 3/8] emacs: Move search-target logic to `notmuch-search-show-result'

diff --git a/6d/44ab9f87cfeb97485c069d4f6c3ca643d12a09 b/6d/44ab9f87cfeb97485c069d4f6c3ca643d12a09
new file mode 100644 (file)
index 0000000..d1d455a
--- /dev/null
+++ b/6d/44ab9f87cfeb97485c069d4f6c3ca643d12a09
@@ -0,0 +1,154 @@
+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 8B69C431FD8\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 15:21:10 -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 ZNO-aod-YEZG for <notmuch@notmuchmail.org>;\r
+       Tue,  3 Jul 2012 15:21:06 -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 68416431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 15:21:06 -0700 (PDT)\r
+X-AuditID: 12074425-b7f9b6d0000008c4-5c-4ff37051c068\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 99.1B.02244.15073FF4; Tue,  3 Jul 2012 18:21:05 -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 q63ML40M022244; \r
+       Tue, 3 Jul 2012 18:21:05 -0400\r
+Received: from drake.dyndns.org (26-4-182.dynamic.csail.mit.edu [18.26.4.182])\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 q63ML1wU023221\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 3 Jul 2012 18:21:02 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SmBSv-0007fP-0N; Tue, 03 Jul 2012 18:21:01 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/8] emacs: Move search-target logic to\r
+       `notmuch-search-show-result'\r
+Date: Tue,  3 Jul 2012 18:20:54 -0400\r
+Message-Id: <1341354059-29396-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1341354059-29396-1-git-send-email-amdragon@mit.edu>\r
+References: <1341354059-29396-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrIIsWRmVeSWpSXmKPExsUixG6nohtY8NnfYMpfQ4sje2axWyw985/Z\r
+       4vrNmcwWb1bOY3Vg8dg56y67x+GvC1k8nq26xezR9GMxawBLFJdNSmpOZllqkb5dAlfG429r\r
+       2QtmS1fcO3mFqYHxhWgXIyeHhICJxI+ja1ggbDGJC/fWs3UxcnEICexjlJi5rpEVwlnPKPH+\r
+       xWOwKiGBk0wS105ZQiTmMkpM2H+XCSTBJqAhsW3/ckYQW0RAWmLn3dmsIDazQK7E2dbDYHFh\r
+       gRCJKXeWg9WzCKhKXPhwGSzOK+Ag0bbqCiPEGfIST+/3sYHYnAKOEitunoVa7CCx7UMH6wRG\r
+       /gWMDKsYZVNyq3RzEzNzilOTdYuTE/PyUot0LfRyM0v0UlNKNzGCQ85FdQfjhENKhxgFOBiV\r
+       eHgTFT77C7EmlhVX5h5ilORgUhLlvZIHFOJLyk+pzEgszogvKs1JLT7EKMHBrCTCuzoJKMeb\r
+       klhZlVqUD5OS5mBREue9kXLTX0ggPbEkNTs1tSC1CCYrw8GhJMHbmg/UKFiUmp5akZaZU4KQ\r
+       ZuLgBBnOAzR8GUgNb3FBYm5xZjpE/hSjopQ4bxVIQgAkkVGaB9cLSwmvGMWBXhHm7QSp4gGm\r
+       E7juV0CDmYAG5y3+BDK4JBEhJdXAaPzC4MFWKafuVWvvyr8009my1GgOY1jR/dKOtO+aDyL/\r
+       fdm1s6Ii4XJBxLLt38KLao448JR/O/1a+vCbksXNW6RcNdMVj7z/Mc11VWh6498rsm66t9Tn\r
+       CByZdvnCqgLenljJ1olblx2+aBLHFf9gd9rFM1H/n16VX5IpuFk+SsXnELt/yqJuEyWW4oxE\r
+       Qy3mouJEAF295MLkAgAA\r
+Cc: tomi.ollila@iki.fi\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: Tue, 03 Jul 2012 22:21:10 -0000\r
+\r
+This is a simpler place to do this, since we can avoid any point\r
+motion and hence any save-excursions in\r
+`notmuch-search-process-filter', which in turn lets us put all of the\r
+search-target logic outside of any save-excursions.\r
+\r
+`notmuch-search-process-filter' could use some reindentation after\r
+this, but we're about to rewrite it entirely, so we won't bother.\r
+---\r
+ emacs/notmuch.el |   33 +++++++++++++++------------------\r
+ 1 file changed, 15 insertions(+), 18 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index dadc6d6..4a6490a 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -729,24 +729,27 @@ non-authors is found, assume that all of the authors match."\r
+ (defun notmuch-search-show-result (thread-id date count authors subject tags)\r
+   ;; Ignore excluded matches\r
+   (unless (eq (aref count 1) ?0)\r
+-    (let ((beg (point))\r
++    (let ((beg (point-max))\r
+         (tags-str (mapconcat 'identity tags " ")))\r
+-      (dolist (format notmuch-search-result-format)\r
+-      (notmuch-search-insert-field (car format) (cdr format)\r
+-                                   date count authors subject tags-str))\r
+-      (insert "\n")\r
+-      (notmuch-search-color-line beg (point) tags)\r
+-      (put-text-property beg (point) 'notmuch-search-thread-id thread-id)\r
+-      (put-text-property beg (point) 'notmuch-search-authors authors)\r
+-      (put-text-property beg (point) 'notmuch-search-subject subject))))\r
++      (save-excursion\r
++      (goto-char beg)\r
++      (dolist (format notmuch-search-result-format)\r
++        (notmuch-search-insert-field (car format) (cdr format)\r
++                                     date count authors subject tags-str))\r
++      (insert "\n")\r
++      (notmuch-search-color-line beg (point) tags)\r
++      (put-text-property beg (point) 'notmuch-search-thread-id thread-id)\r
++      (put-text-property beg (point) 'notmuch-search-authors authors)\r
++      (put-text-property beg (point) 'notmuch-search-subject subject))\r
++      (when (string= thread-id notmuch-search-target-thread)\r
++      (setq notmuch-search-target-thread "found")\r
++      (goto-char beg)))))\r
+ \r
+ (defun notmuch-search-process-filter (proc string)\r
+   "Process and filter the output of \"notmuch search\""\r
+-  (let ((buffer (process-buffer proc))\r
+-      (found-target nil))\r
++  (let ((buffer (process-buffer proc)))\r
+     (if (buffer-live-p buffer)\r
+       (with-current-buffer buffer\r
+-        (save-excursion\r
+           (let ((line 0)\r
+                 (more t)\r
+                 (inhibit-read-only t)\r
+@@ -763,12 +766,8 @@ non-authors is found, assume that all of the authors match."\r
+                          (subject (match-string 5 string))\r
+                          (tags (match-string 6 string))\r
+                          (tag-list (if tags (save-match-data (split-string tags)))))\r
+-                    (goto-char (point-max))\r
+                     (if (/= (match-beginning 1) line)\r
+                         (insert (concat "Error: Unexpected output from notmuch search:\n" (substring string line (match-beginning 1)) "\n")))\r
+-                    (when (string= thread-id notmuch-search-target-thread)\r
+-                      (set 'found-target (point))\r
+-                      (set 'notmuch-search-target-thread "found"))\r
+                     (notmuch-search-show-result thread-id date count authors subject tag-list)\r
+                     (set 'line (match-end 0)))\r
+                 (set 'more nil)\r
+@@ -777,8 +776,6 @@ non-authors is found, assume that all of the authors match."\r
+                 (if (< line (length string))\r
+                     (setq notmuch-search-process-filter-data (substring string line)))\r
+                 ))))\r
+-        (if found-target\r
+-            (goto-char found-target)))\r
+       (delete-process proc))))\r
+ \r
+ (defun notmuch-search-tag-all (&optional tag-changes)\r
+-- \r
+1.7.10\r
+\r