[PATCH 2/8] emacs: Separate search line parsing and display

diff --git a/c5/8252c5d79858f594ed5cd2a46ee15bfd7e0651 b/c5/8252c5d79858f594ed5cd2a46ee15bfd7e0651
new file mode 100644 (file)
index 0000000..6e725d8
--- /dev/null
+++ b/c5/8252c5d79858f594ed5cd2a46ee15bfd7e0651
@@ -0,0 +1,135 @@
+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 72263431FC2\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 15:21:18 -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 CQKy3Fx1JZ5Q for <notmuch@notmuchmail.org>;\r
+       Tue,  3 Jul 2012 15:21:17 -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 EE190431FD0\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 15:21:06 -0700 (PDT)\r
+X-AuditID: 1209190d-b7fd56d000000933-d2-4ff37052ae2b\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 63.F1.02355.25073FF4; Tue,  3 Jul 2012 18:21:06 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q63ML46X010807; \r
+       Tue, 3 Jul 2012 18:21:04 -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 q63ML19w023220\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 1SmBSu-0007fM-W9; Tue, 03 Jul 2012 18:21:00 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/8] emacs: Separate search line parsing and display\r
+Date: Tue,  3 Jul 2012 18:20:53 -0400\r
+Message-Id: <1341354059-29396-3-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+NgFjrPIsWRmVeSWpSXmKPExsUixG6nrhtU8NnfYP9rDosje2axWyw985/Z\r
+       4vrNmcwWb1bOY3Vg8dg56y67x+GvC1k8nq26xezR9GMxawBLFJdNSmpOZllqkb5dAlfGp70z\r
+       2QqWile8vvyBvYHxtlAXIweHhICJxOLfyV2MnECmmMSFe+vZuhi5OIQE9jFKnLnzkgXCWc8o\r
+       8X3/TXYI5ySTxMlt36CcuYwSV6+vZgHpZxPQkNi2fzkjiC0iIC2x8+5sVhCbWSBX4mzrYUaQ\r
+       dcICLhIf7kuBmCwCqhKnj6aAVPAKOEh8/32IEeIKeYmn9/vYQGxOAUeJFTfPgk0XAqrZ9qGD\r
+       dQIj/wJGhlWMsim5Vbq5iZk5xanJusXJiXl5qUW6Rnq5mSV6qSmlmxhB4cYpybuD8d1BpUOM\r
+       AhyMSjy8iQqf/YVYE8uKK3MPMUpyMCmJ8l7JAwrxJeWnVGYkFmfEF5XmpBYfYpTgYFYS4V2d\r
+       BJTjTUmsrEotyodJSXOwKInzXkm56S8kkJ5YkpqdmlqQWgSTleHgUJLgPZAP1ChYlJqeWpGW\r
+       mVOCkGbi4AQZzgM0fBlIDW9xQWJucWY6RP4Uo6KUOO9OkIQASCKjNA+uF5YOXjGKA70izHsU\r
+       pIoHmErgul8BDWYCGpy3+BPI4JJEhJRUA+PF/1c7RBfe9hP9Oyt7edzp5z+aQ0TzfApPfQ3R\r
+       FpxXY8HgeZej/Y7UnO2h8+RWrxC/WtR/NWOixmLFJ0wC9z2n/vQLFiu/9VR8Qc0Zln0XeCYn\r
+       STqqZ9euuLCt+9Sl2+oTSi4sX2Wodyq4Q75mubnOFk71JXF9fvHHv39+IWfN6rdoft2dvY5K\r
+       LMUZiYZazEXFiQBXzuK04gIAAA==\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:18 -0000\r
+\r
+Previously, much of the display of search lines was done in the same\r
+function that parsed the CLI's output.  Now the parsing function only\r
+parses, and notmuch-search-show-result fully inserts the search result\r
+in the search buffer.\r
+---\r
+ emacs/notmuch.el |   33 +++++++++++++++++----------------\r
+ 1 file changed, 17 insertions(+), 16 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index be217a2..dadc6d6 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -726,11 +726,19 @@ non-authors is found, assume that all of the authors match."\r
+     (insert\r
+      (format format (propertize tags 'font-lock-face 'notmuch-tag-face))))))\r
+ \r
+-(defun notmuch-search-show-result (date count authors subject tags)\r
+-  (dolist (format notmuch-search-result-format)\r
+-    (notmuch-search-insert-field (car format) (cdr format)\r
+-                               date count authors subject tags))\r
+-  (insert "\n"))\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
++        (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
+ \r
+ (defun notmuch-search-process-filter (proc string)\r
+   "Process and filter the output of \"notmuch search\""\r
+@@ -758,17 +766,10 @@ non-authors is found, assume that all of the authors match."\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
+-                    ;; We currently just throw away excluded matches.\r
+-                    (unless (eq (aref count 1) ?0)\r
+-                      (let ((beg (point)))\r
+-                        (notmuch-search-show-result date count authors subject tags)\r
+-                        (notmuch-search-color-line beg (point) tag-list)\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
+-                          (set 'found-target beg)\r
+-                          (set 'notmuch-search-target-thread "found"))))\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
+                 (while (and (< line (length string)) (= (elt string line) ?\n))\r
+-- \r
+1.7.10\r
+\r