From 7a534dac18c423b0696ae6d47ba9fa901c4b7266 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 2 Aug 2012 09:59:27 +0200 Subject: [PATCH] Re: [PATCH] emacs: fix a bug introduced by the recent search cleanups. --- 23/7b756135953652b4e46c32ea6f753da6865607 | 129 ++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 23/7b756135953652b4e46c32ea6f753da6865607 diff --git a/23/7b756135953652b4e46c32ea6f753da6865607 b/23/7b756135953652b4e46c32ea6f753da6865607 new file mode 100644 index 000000000..d80023051 --- /dev/null +++ b/23/7b756135953652b4e46c32ea6f753da6865607 @@ -0,0 +1,129 @@ +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 1D942431FAF + for ; Thu, 2 Aug 2012 00:59:35 -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 s34IArDd-JAY for ; + Thu, 2 Aug 2012 00:59:34 -0700 (PDT) +Received: from mail-gg0-f181.google.com (mail-gg0-f181.google.com + [209.85.161.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 91AA0431FAE + for ; Thu, 2 Aug 2012 00:59:34 -0700 (PDT) +Received: by ggnv5 with SMTP id v5so10213621ggn.26 + for ; Thu, 02 Aug 2012 00:59:33 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:in-reply-to:references:user-agent:date + :message-id:mime-version:content-type:x-gm-message-state; + bh=Gs+4tGlkFTgD0TIXJCZVuzCgyPmHjL5toGnqFv1AOr8=; + b=nCzIU/qpypZZrT7HGZPCKJt4hoJ7eOxbwucIeqdyZcdY6S8Xgv1ufGZ/hQ8vvXWAnN + T1Qg7hXyrWKEC3yWnWRkz9KzvQJIaZLOrYVAUc1CJnSMTkRRKJmxRvIuH7C6vDUjFrcA + nTfqFSYgztk+qzCmWPlc2goiiLTnx+H+FgxwRKomHPjftwCqFhsrCqEOiDRbNBWbxnq+ + gEkyyw/wusOYjZSbDBoxV/tTBehSiQS40NH1WG2HV7si/9mrFWeqDuFN/V59tYoamEvS + SACH2qSsEkUuMsNllweVtYofsTbSwHbEDMp0lK1ao5cLc6wZ23zhUhTKl9ZutvSZf1Ye + YckA== +Received: by 10.236.143.4 with SMTP id k4mr19725845yhj.111.1343894372928; + Thu, 02 Aug 2012 00:59:32 -0700 (PDT) +Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3]) + by mx.google.com with ESMTPS id y13sm132361anj.5.2012.08.02.00.59.31 + (version=SSLv3 cipher=OTHER); Thu, 02 Aug 2012 00:59:32 -0700 (PDT) +From: Jani Nikula +To: Mark Walters , + Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH] emacs: fix a bug introduced by the recent search + cleanups. +In-Reply-To: <87r4rpsquu.fsf@qmul.ac.uk> +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> <87r4rpsquu.fsf@qmul.ac.uk> +User-Agent: Notmuch/0.13.2+106~gb810aee (http://notmuchmail.org) Emacs/23.2.1 + (x86_64-pc-linux-gnu) +Date: Thu, 02 Aug 2012 09:59:27 +0200 +Message-ID: <87k3xhafmo.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Gm-Message-State: + ALoCoQkEpB4HFZjDaTOjKk7pboetflSxaTQiA242vD+pKJ879Ehn/77Ju/fYyM5UlmV5BqTsThUR +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:59:35 -0000 + +On Thu, 02 Aug 2012, Mark Walters wrote: +> 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. + +Works for me, +J. + + +> --- +> +>> 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