From 717f4f3291d1bf829b47086f5c090a709f7c4371 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 2 Aug 2012 08:19:37 +0100 Subject: [PATCH] [PATCH] emacs: fix a bug introduced by the recent search cleanups. --- ff/0ac4883357d50726ae451e107d18ec8259972f | 135 ++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 ff/0ac4883357d50726ae451e107d18ec8259972f diff --git a/ff/0ac4883357d50726ae451e107d18ec8259972f b/ff/0ac4883357d50726ae451e107d18ec8259972f new file mode 100644 index 000000000..1dd0b6544 --- /dev/null +++ b/ff/0ac4883357d50726ae451e107d18ec8259972f @@ -0,0 +1,135 @@ +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 30B42431FAF + for ; Thu, 2 Aug 2012 00:19:45 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 sQcFunOa+TPZ for ; + Thu, 2 Aug 2012 00:19:44 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 881F7431FAE + for ; Thu, 2 Aug 2012 00:19:44 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1Swph4-0004Fs-Da; Thu, 02 Aug 2012 08:19:38 +0100 +Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223] + helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1Swph4-0001co-3t; Thu, 02 Aug 2012 08:19:38 +0100 +From: Mark Walters +To: Jani Nikula , Austin Clements , + notmuch@notmuchmail.org +Subject: [PATCH] emacs: fix a bug introduced by the recent search cleanups. +In-Reply-To: <87mx2dais8.fsf@nikula.org> +References: <1341354059-29396-1-git-send-email-amdragon@mit.edu> + <1342892232-5659-1-git-send-email-amdragon@mit.edu> + <1342892232-5659-8-git-send-email-amdragon@mit.edu> + <87mx2dais8.fsf@nikula.org> +User-Agent: Notmuch/0.13.2+96~g634443c (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Thu, 02 Aug 2012 08:19:37 +0100 +Message-ID: <87r4rpsquu.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 94.192.233.223 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: be0b14068fdfc05b5b6d6afd87513faf (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + * domain + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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, 02 Aug 2012 07:19:45 -0000 + + +In commit 5d0883e the function notmuch-search-next-thread was changed. +In particular it only goes to the next message if there is a next +message. This breaks notmuch-show-archive-thread-then-next. Fix this +by going to the "next" message whenever we are on a current message. +--- + +> On Sat, 21 Jul 2012, Austin Clements wrote: +>> At this point, the only remaining functions that don't support +>> multi-line search result formats are the thread navigation functions. +>> This patch fixes that by rewriting them in terms of +>> notmuch-search-result-{beginning,end}. +>> +>> This changes the behavior of notmuch-search-previous-thread slightly +>> so that if point isn't at the beginning of a result, it first moves +>> point to the beginning of the result. +> +> Hi Austin, bisecting suggests this patch (committed as 5d0883e) breaks +> notmuch-show-archive-thread-then-next and subsequently +> notmuch-show-advance-and-archive for me. When showing the last thread in +> the search results, notmuch-show-archive-thread-then-next used to exit +> to the end of the search buffer. Now it redisplays the current +> thread. When I hit SPC to cruise through mails, there's no indication +> that I've reached the end of search results, other than the same thread +> being displayed over and over. + +This might be the correct fix but I am not certain. It doesn't instantly +break for me! (It looks more similar to what happened before the parent +patch.) + +Best wishes + +Mark + + + emacs/notmuch.el | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index fd1836f..d2d82a9 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -293,7 +293,7 @@ For a mouse binding, return nil." + (defun notmuch-search-next-thread () + "Select the next thread in the search results." + (interactive) +- (when (notmuch-search-get-result (notmuch-search-result-end)) ++ (when (notmuch-search-get-result) + (goto-char (notmuch-search-result-end)))) + + (defun notmuch-search-previous-thread () +-- +1.7.9.1 + + + -- 2.26.2