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 12E09431FD4 for ; Sun, 30 Jun 2013 01:55:31 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0.201 X-Spam-Level: X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, 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 P2ArrPPUci2D for ; Sun, 30 Jun 2013 01:55:24 -0700 (PDT) Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id F3CEF431FBD for ; Sun, 30 Jun 2013 01:55:20 -0700 (PDT) Received: by mail-wg0-f46.google.com with SMTP id c11so2837110wgh.1 for ; Sun, 30 Jun 2013 01:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=XzJaoAhElxwtShCfEiBQOzCEn0t/I9eQ6eGGSkiLjsU=; b=xcgiMIiev4mAUy2f7PCEhUvXk80SRXOWBPeGWUg7Gy4CNaDaoko0Z9ekKW3F/6q0SY Zbp1VD+vGLVSH/NuUBR3uR7WhAcJ6cwCcYG0OZJGwsT06aWAZ6V2/TWUs2hxh7a6zld+ HYlbvz8z1hIB00g8rBomN9EFt8TzEMD3EhiOcOi5nQbPqczduOE93C/kBOShc7x8pQ9f mQUa1fDTl+lgvYFD1bHBpVl21mD4ivWZDAt9+VUaJ5ZaTaz9fXIkSD5bjqHixDcRYIsF YFhfJ1DKxtw89p4qh78mkxWV6BsS4AL3HvbDxxfQmfIu0GLDy8REESGqKsgbT4GBGRtv IfBA== X-Received: by 10.194.8.163 with SMTP id s3mr17062287wja.41.1372582519924; Sun, 30 Jun 2013 01:55:19 -0700 (PDT) Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) by mx.google.com with ESMTPSA id fb9sm8604021wid.2.2013.06.30.01.55.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 30 Jun 2013 01:55:19 -0700 (PDT) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH v2 2/3] contrib: pick: remove hack notmuch-pick-show-match-message-with-wait Date: Sun, 30 Jun 2013 09:55:11 +0100 Message-Id: <1372582512-10777-3-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1372582512-10777-1-git-send-email-markwalters1009@gmail.com> References: <1372582512-10777-1-git-send-email-markwalters1009@gmail.com> 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: Sun, 30 Jun 2013 08:55:31 -0000 This function was a horrible hack (sleeping while waiting for the correct message). The new target code can just open the message in the message window when it arrives. --- contrib/notmuch-pick/notmuch-pick.el | 37 +++++++++++----------------------- 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el index ef16ca7..5639c7c 100644 --- a/contrib/notmuch-pick/notmuch-pick.el +++ b/contrib/notmuch-pick/notmuch-pick.el @@ -157,6 +157,8 @@ (make-variable-buffer-local 'notmuch-pick-query-context) (defvar notmuch-pick-target-msg nil) (make-variable-buffer-local 'notmuch-pick-target-msg) +(defvar notmuch-pick-open-target nil) +(make-variable-buffer-local 'notmuch-pick-open-target) (defvar notmuch-pick-buffer-name nil) (make-variable-buffer-local 'notmuch-pick-buffer-name) ;; This variable is the window used for the message pane. It is set @@ -349,8 +351,8 @@ Does NOT change the database." (notmuch-pick (notmuch-search-find-thread-id) notmuch-search-query-string nil - (notmuch-prettify-subject (notmuch-search-find-subject))) - (notmuch-pick-show-match-message-with-wait)) + (notmuch-prettify-subject (notmuch-search-find-subject)) + t)) (defun notmuch-pick-message-window-kill-hook () (let ((buffer (current-buffer))) @@ -489,22 +491,6 @@ message will be \"unarchived\", i.e. the tag changes in (when (window-live-p notmuch-pick-message-window) (notmuch-pick-show-message))) -(defun notmuch-pick-show-match-message-with-wait () - "Show the first matching message but wait for it to appear or search to finish." - (interactive) - (unless (notmuch-pick-get-match) - (notmuch-pick-next-matching-message)) - (while (and (not (notmuch-pick-get-match)) - (get-buffer-process (current-buffer))) - (message "waiting for message") - (sit-for 0.1) - (goto-char (point-min)) - (unless (notmuch-pick-get-match) - (notmuch-pick-next-matching-message))) - (message nil) - (when (notmuch-pick-get-match) - (notmuch-pick-show-message))) - (defun notmuch-pick-refresh-view () "Refresh view." (interactive) @@ -658,7 +644,9 @@ unchanged ADDRESS if parsing fails." (string= msg-id target)) (setq notmuch-pick-target-msg "found") (goto-char (point-max)) - (forward-line -1)))) + (forward-line -1) + (when notmuch-pick-open-target + (notmuch-pick-show-message))))) (defun notmuch-pick-insert-tree (tree depth tree-status first last) "Insert the message tree TREE at depth DEPTH in the current thread." @@ -778,13 +766,14 @@ Complete list of currently available key bindings: (notmuch-sexp-parse-partial-list 'notmuch-pick-insert-forest-thread results-buf))))) -(defun notmuch-pick-worker (basic-query &optional query-context target buffer) +(defun notmuch-pick-worker (basic-query &optional query-context target buffer open-target) (interactive) (notmuch-pick-mode) (setq notmuch-pick-basic-query basic-query) (setq notmuch-pick-query-context query-context) (setq notmuch-pick-buffer-name (buffer-name buffer)) (setq notmuch-pick-target-msg target) + (setq notmuch-pick-open-target open-target) (erase-buffer) (goto-char (point-min)) @@ -816,7 +805,7 @@ Complete list of currently available key bindings: (insert "End of search results.\n")))))) -(defun notmuch-pick (&optional query query-context target buffer-name show-first-match) +(defun notmuch-pick (&optional query query-context target buffer-name open-target) "Run notmuch pick with the given `query' and display the results" (interactive "sNotmuch pick: ") (if (null query) @@ -830,11 +819,9 @@ Complete list of currently available key bindings: ;; Don't track undo information for this buffer (set 'buffer-undo-list t) - (notmuch-pick-worker query query-context target buffer) + (notmuch-pick-worker query query-context target buffer open-target) - (setq truncate-lines t) - (when show-first-match - (notmuch-pick-show-match-message-with-wait)))) + (setq truncate-lines t))) ;; Set up key bindings from the rest of notmuch. -- 1.7.9.1