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

diff --git a/4f/3079d009ca46370f87dc618e27574d8a43e74a b/4f/3079d009ca46370f87dc618e27574d8a43e74a
new file mode 100644 (file)
index 0000000..30c71c4
--- /dev/null
+++ b/4f/3079d009ca46370f87dc618e27574d8a43e74a
@@ -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 6723D431FBF\r
+       for <notmuch@notmuchmail.org>; Mon,  9 Jul 2012 14:42:50 -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 bc5b8DVljDup for <notmuch@notmuchmail.org>;\r
+       Mon,  9 Jul 2012 14:42:49 -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 52D06431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  9 Jul 2012 14:42:49 -0700 (PDT)\r
+X-AuditID: 1209190d-b7fd56d000000933-8f-4ffb505852b5\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 58.19.02355.8505BFF4; Mon,  9 Jul 2012 17:42:48 -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 q69LglVv006999; \r
+       Mon, 9 Jul 2012 17:42:47 -0400\r
+Received: from drake.dyndns.org (26-4-176.dynamic.csail.mit.edu [18.26.4.176])\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 q69Lgib6022683\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 9 Jul 2012 17:42:45 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SoLjA-0004fr-01; Mon, 09 Jul 2012 17:42:43 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 2/9] emacs: Separate search line parsing and display\r
+Date: Mon,  9 Jul 2012 17:42:35 -0400\r
+Message-Id: <1341870162-17782-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1341870162-17782-1-git-send-email-amdragon@mit.edu>\r
+References: <1341354059-29396-1-git-send-email-amdragon@mit.edu>\r
+       <1341870162-17782-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nrhsR8Nvf4NhTDYvVc3ksrt+cyWzx\r
+       ZuU8Vgdmj52z7rJ7HP66kMXj2apbzAHMUVw2Kak5mWWpRfp2CVwZ139sZSvYJV5xaPsR1gbG\r
+       l0JdjJwcEgImEq2vNrJC2GISF+6tZ+ti5OIQEtjHKHFg60xWCGc9o8T2/a+hnJNMElfOP4Vy\r
+       5jJKrGjYxQLSzyagIbFt/3JGEFtEQFpi593ZYHOZBeIktkz5DxYXFnCXWL96NRuIzSKgKjFz\r
+       +W+wXl4BB4kj/7ZB3SEv8fR+H1gNp4CjxJybO8B6hQTKJT7f+Mc8gZF/ASPDKkbZlNwq3dzE\r
+       zJzi1GTd4uTEvLzUIl0jvdzMEr3UlNJNjKDw4pTk3cH47qDSIUYBDkYlHt4opt/+QqyJZcWV\r
+       uYcYJTmYlER58zyBQnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4b7kC5XhTEiurUovyYVLSHCxK\r
+       4rxXUm76CwmkJ5akZqemFqQWwWRlODiUJHin+QM1ChalpqdWpGXmlCCkmTg4QYbzAA2fAFLD\r
+       W1yQmFucmQ6RP8WoKCXOOxkkIQCSyCjNg+uFxf8rRnGgV4R5d4BU8QBTB1z3K6DBTECD23t+\r
+       gQwuSURISTUwLspwcJaNtpN4nugvf94n8u1DQ98vT4Qc3k9JL7sYbBZ31+NOwZ/vEadsOWW+\r
+       O69/tzuz++U5JdZ3/TKNPO9SNUoPveloCTdr2ZMmUM8c+EwiSE4+TGGaftV7ix9qb7Yub7CT\r
+       K3KTCzzW+erxGacl6do6AUd+z1vo0GGkrt23rK4/x0smRE6JpTgj0VCLuag4EQBgJYcR2gIA        AA==\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: Mon, 09 Jul 2012 21:42:50 -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 8ad0b68..746d0cb 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -727,11 +727,19 @@ non-authors is found, assume that all of the authors match."\r
+     ;; depends on the format of this\r
+     (insert (concat "(" (propertize tags 'font-lock-face 'notmuch-tag-face) ")")))))\r
+ \r
+-(defun notmuch-search-show-result (date count authors subject tags)\r
+-  (dolist (spec notmuch-search-result-format)\r
+-    (notmuch-search-insert-field (car spec) (cdr spec)\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 (spec notmuch-search-result-format)\r
++      (notmuch-search-insert-field (car spec) (cdr spec)\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
+@@ -759,17 +767,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