From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id DB879431FAE for ; Thu, 5 Jul 2012 13:52:51 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zu0nHU2Z6MkJ for ; Thu, 5 Jul 2012 13:52:50 -0700 (PDT) Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU [18.7.68.36]) by olra.theworths.org (Postfix) with ESMTP id 018E1431FCB for ; Thu, 5 Jul 2012 13:52:43 -0700 (PDT) X-AuditID: 12074424-b7f2a6d0000008bf-2f-4ff5fe9bf12e Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP id C6.5B.02239.B9EF5FF4; Thu, 5 Jul 2012 16:52:43 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q65KqgH8024132; Thu, 5 Jul 2012 16:52:42 -0400 Received: from drake.dyndns.org (26-4-182.dynamic.csail.mit.edu [18.26.4.182]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q65KqbS5027237 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Thu, 5 Jul 2012 16:52:39 -0400 (EDT) Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1Smt2T-0004Xc-Iw; Thu, 05 Jul 2012 16:52:37 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH v2 4/9] emacs: Move search-target logic to `notmuch-search-show-result' Date: Thu, 5 Jul 2012 16:52:22 -0400 Message-Id: <1341521547-15502-5-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1341521547-15502-1-git-send-email-amdragon@mit.edu> References: <1341354059-29396-1-git-send-email-amdragon@mit.edu> <1341521547-15502-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixCmqrDv731d/g6vLRS1Wz+WxuH5zJrPF m5XzWB2YPXbOusvucfjrQhaPZ6tuMQcwR3HZpKTmZJalFunbJXBl3J2zi7Fgv1zF9bZ2lgbG bRJdjJwcEgImEmffb2CFsMUkLtxbz9bFyMUhJLCPUaLpwgomCGc9o8T5/42MIFVCAieZJFbf DYdIzGWUWLpzOhtIgk1AQ2Lb/uVgRSIC0hI7784GG8ssECexZcp/sLiwQLjEsv0/wOpZBFQl rl56A2RzcPAKOEh86I2FuEJe4un9PrASTgFHiQsTF0PtLZf4s+QfywRG/gWMDKsYZVNyq3Rz EzNzilOTdYuTE/PyUot0zfVyM0v0UlNKNzGCQovdRWUHY/MhpUOMAhyMSjy8hrlf/IVYE8uK K3MPMUpyMCmJ8jb+/uovxJeUn1KZkVicEV9UmpNafIhRgoNZSYS3NwMox5uSWFmVWpQPk5Lm YFES572ectNfSCA9sSQ1OzW1ILUIJivDwaEkwfv0L1CjYFFqempFWmZOCUKaiYMTZDgP0PAX IDW8xQWJucWZ6RD5U4yKUkCjQRICIImM0jy4Xljsv2IUB3pFmPcTSBUPMG3Adb8CGswENDhv 8SeQwSWJCCmpBkaNnufl5btMb66I6PR4vWLGjQuPHwo5p4XtrLox4+WjW2mHTHOn/UvjY3Wb 81XiSETYk/gtTsZ8NzmO5OQIOBolCQaFCnfwXtZWDpjyetkH8wUf7qnMnsbyJNO5usv2RZZ+ 9+n7H2XWGu8/uVQ7qqXKMei1nOQtucuZxSyTNn+Nel+4cu78liIlluKMREMt5qLiRACyognh 2AIAAA== Cc: tomi.ollila@iki.fi X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2012 20:52:52 -0000 This is a simpler place to do this, since we can avoid any point motion and hence any save-excursions in `notmuch-search-process-filter', which in turn lets us put all of the search-target logic outside of any save-excursions. `notmuch-search-show-{result,error}' are now responsible for their own point motion. `notmuch-search-process-filter' could use some reindentation after this, but we're about to rewrite it entirely, so we won't bother. --- emacs/notmuch.el | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index f952fa8..5bf01ca 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -730,29 +730,34 @@ non-authors is found, assume that all of the authors match." (defun notmuch-search-show-result (thread-id date count authors subject tags) ;; Ignore excluded matches (unless (eq (aref count 1) ?0) - (let ((beg (point)) + (let ((beg (point-max)) (tags-str (mapconcat 'identity tags " "))) - (dolist (spec notmuch-search-result-format) - (notmuch-search-insert-field (car spec) (cdr spec) - date count authors subject tags-str)) - (insert "\n") - (notmuch-search-color-line beg (point) tags) - (put-text-property beg (point) 'notmuch-search-thread-id thread-id) - (put-text-property beg (point) 'notmuch-search-authors authors) - (put-text-property beg (point) 'notmuch-search-subject subject)))) + (save-excursion + (goto-char beg) + (dolist (spec notmuch-search-result-format) + (notmuch-search-insert-field (car spec) (cdr spec) + date count authors subject tags-str)) + (insert "\n") + (notmuch-search-color-line beg (point) tags) + (put-text-property beg (point) 'notmuch-search-thread-id thread-id) + (put-text-property beg (point) 'notmuch-search-authors authors) + (put-text-property beg (point) 'notmuch-search-subject subject)) + (when (string= thread-id notmuch-search-target-thread) + (setq notmuch-search-target-thread "found") + (goto-char beg))))) (defun notmuch-search-show-error (string &rest objects) - (insert "Error: Unexpected output from notmuch search:\n") - (insert (apply #'format string objects)) - (insert "\n")) + (save-excursion + (goto-char (point-max)) + (insert "Error: Unexpected output from notmuch search:\n") + (insert (apply #'format string objects)) + (insert "\n"))) (defun notmuch-search-process-filter (proc string) "Process and filter the output of \"notmuch search\"" - (let ((buffer (process-buffer proc)) - (found-target nil)) + (let ((buffer (process-buffer proc))) (if (buffer-live-p buffer) (with-current-buffer buffer - (save-excursion (let ((line 0) (more t) (inhibit-read-only t) @@ -769,13 +774,9 @@ non-authors is found, assume that all of the authors match." (subject (match-string 5 string)) (tags (match-string 6 string)) (tag-list (if tags (save-match-data (split-string tags))))) - (goto-char (point-max)) (if (/= (match-beginning 1) line) (notmuch-search-show-error (substring string line (match-beginning 1)))) - (when (string= thread-id notmuch-search-target-thread) - (set 'found-target (point)) - (set 'notmuch-search-target-thread "found")) (notmuch-search-show-result thread-id date count authors subject tag-list) (set 'line (match-end 0))) (set 'more nil) @@ -784,8 +785,6 @@ non-authors is found, assume that all of the authors match." (if (< line (length string)) (setq notmuch-search-process-filter-data (substring string line))) )))) - (if found-target - (goto-char found-target))) (delete-process proc)))) (defun notmuch-search-tag-all (&optional tag-changes) -- 1.7.10