From efbccc869a03c241468e64731a315e07545e2fb6 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 26 May 2013 07:50:07 +0100 Subject: [PATCH] [PATCH 1/2] contrib: pick: remove hack notmuch-pick-show-match-message-with-wait --- c0/0e0837ca84fcc230dd82253b4bb2adfbfc04e4 | 171 ++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 c0/0e0837ca84fcc230dd82253b4bb2adfbfc04e4 diff --git a/c0/0e0837ca84fcc230dd82253b4bb2adfbfc04e4 b/c0/0e0837ca84fcc230dd82253b4bb2adfbfc04e4 new file mode 100644 index 000000000..ad5bb9a37 --- /dev/null +++ b/c0/0e0837ca84fcc230dd82253b4bb2adfbfc04e4 @@ -0,0 +1,171 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 4755E431FC7 + for ; Sat, 25 May 2013 23:50:23 -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 VTKI+Q-48sbt for ; + Sat, 25 May 2013 23:50:16 -0700 (PDT) +Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com + [209.85.212.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 7C58F431FAF + for ; Sat, 25 May 2013 23:50:16 -0700 (PDT) +Received: by mail-wi0-f182.google.com with SMTP id c10so724774wiw.15 + for ; Sat, 25 May 2013 23:50:15 -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=rLOnFyJmbgSQ25Qqq7hucdxQbYEMH6nuxHVoSjrflMU=; + b=lxfyBvHFcyb/NOPTvWnRqX6Uhm4M/fOVk6NdLVioGnxteB+tR0IzQHC6ckMlq3ZyqS + vhtHoBSoWiUtOa53hRAUsV/9kSjfVDCAxTG9gVCEPCEVhCJSQvVmV8yRSsXtWTT3+4aa + Ds+JQLcc4XfhB0OIcLUvhZ2S+ZP8I7W5FT6ANouYgH4STBGYIQi0qgn4ndxUkh0xDcdo + 0gsC/p3uireLRXN6fgIcPqnWd3EmTX/9eaiuksJOTH10PpEeBeGR+UI4uELgeOMHsGrX + I8nlKgAXHlYG++5+07aMNzxYjMDqAw0RNp1qDeTNV35j/ZmSUyAFwI2LjFd86I2GYbpl + Fqmg== +X-Received: by 10.180.188.141 with SMTP id ga13mr4131817wic.9.1369551015442; + Sat, 25 May 2013 23:50:15 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id q20sm9057223wiv.7.2013.05.25.23.50.14 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 25 May 2013 23:50:14 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] contrib: pick: remove hack + notmuch-pick-show-match-message-with-wait +Date: Sun, 26 May 2013 07:50:07 +0100 +Message-Id: <1369551008-30697-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1369551008-30697-1-git-send-email-markwalters1009@gmail.com> +References: <1369551008-30697-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, 26 May 2013 06:50:23 -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 b7e9515..9112989 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 @@ will be reversed." + (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." +@@ -779,13 +767,14 @@ Complete list of currently available key bindings: + 'notmuch-pick-show-error + 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)) +@@ -817,7 +806,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) +@@ -831,11 +820,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 + -- 2.26.2