--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 7FAE0431FB6\r
+ for <notmuch@notmuchmail.org>; Wed, 4 Jul 2012 01:34:15 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 SnCYA8fiMv2h for <notmuch@notmuchmail.org>;\r
+ Wed, 4 Jul 2012 01:34:14 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 90F49431FAE\r
+ for <notmuch@notmuchmail.org>; Wed, 4 Jul 2012 01:34:14 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SmL2K-0005LK-Ol; Wed, 04 Jul 2012 09:34:13 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SmL2K-0002hU-Dv; Wed, 04 Jul 2012 09:34:12 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 3/8] emacs: Move search-target logic to\r
+ `notmuch-search-show-result'\r
+In-Reply-To: <1341354059-29396-4-git-send-email-amdragon@mit.edu>\r
+References: <1341354059-29396-1-git-send-email-amdragon@mit.edu>\r
+ <1341354059-29396-4-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.13.2+70~gb6a56e7 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 04 Jul 2012 09:34:09 +0100\r
+Message-ID: <87hatnhqm6.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: e6ed7f90d13674af4b0346a8140fd1b7 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Wed, 04 Jul 2012 08:34:15 -0000\r
+\r
+On Tue, 03 Jul 2012, Austin Clements <amdragon@MIT.EDU> wrote:\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
+\r
+Does this mean that error information now comes just before the matching\r
+thread, rather than at the place in the thread list the error actually\r
+occurs? This is not a complaint: just everything else looks like it is\r
+functionally equivalent. (Maybe it is all made irrelevant by a later\r
+patch anyway).\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff