Re: [PATCH] emacs: fix a bug introduced by the recent search cleanups.

diff --git a/23/7b756135953652b4e46c32ea6f753da6865607 b/23/7b756135953652b4e46c32ea6f753da6865607
new file mode 100644 (file)
index 0000000..d800230
--- /dev/null
+++ b/23/7b756135953652b4e46c32ea6f753da6865607
@@ -0,0 +1,129 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1D942431FAF\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 00:59:35 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id s34IArDd-JAY for <notmuch@notmuchmail.org>;\r
+       Thu,  2 Aug 2012 00:59:34 -0700 (PDT)\r
+Received: from mail-gg0-f181.google.com (mail-gg0-f181.google.com\r
+       [209.85.161.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 91AA0431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 00:59:34 -0700 (PDT)\r
+Received: by ggnv5 with SMTP id v5so10213621ggn.26\r
+       for <notmuch@notmuchmail.org>; Thu, 02 Aug 2012 00:59:33 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:in-reply-to:references:user-agent:date\r
+       :message-id:mime-version:content-type:x-gm-message-state;\r
+       bh=Gs+4tGlkFTgD0TIXJCZVuzCgyPmHjL5toGnqFv1AOr8=;\r
+       b=nCzIU/qpypZZrT7HGZPCKJt4hoJ7eOxbwucIeqdyZcdY6S8Xgv1ufGZ/hQ8vvXWAnN\r
+       T1Qg7hXyrWKEC3yWnWRkz9KzvQJIaZLOrYVAUc1CJnSMTkRRKJmxRvIuH7C6vDUjFrcA\r
+       nTfqFSYgztk+qzCmWPlc2goiiLTnx+H+FgxwRKomHPjftwCqFhsrCqEOiDRbNBWbxnq+\r
+       gEkyyw/wusOYjZSbDBoxV/tTBehSiQS40NH1WG2HV7si/9mrFWeqDuFN/V59tYoamEvS\r
+       SACH2qSsEkUuMsNllweVtYofsTbSwHbEDMp0lK1ao5cLc6wZ23zhUhTKl9ZutvSZf1Ye\r
+       YckA==\r
+Received: by 10.236.143.4 with SMTP id k4mr19725845yhj.111.1343894372928;\r
+       Thu, 02 Aug 2012 00:59:32 -0700 (PDT)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+       by mx.google.com with ESMTPS id y13sm132361anj.5.2012.08.02.00.59.31\r
+       (version=SSLv3 cipher=OTHER); Thu, 02 Aug 2012 00:59:32 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Mark Walters <markwalters1009@gmail.com>,\r
+       Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: fix a bug introduced by the recent search\r
+ cleanups.\r
+In-Reply-To: <87r4rpsquu.fsf@qmul.ac.uk>\r
+References: <1341354059-29396-1-git-send-email-amdragon@mit.edu>\r
+       <1342892232-5659-1-git-send-email-amdragon@mit.edu>\r
+       <1342892232-5659-8-git-send-email-amdragon@mit.edu>\r
+       <87mx2dais8.fsf@nikula.org> <87r4rpsquu.fsf@qmul.ac.uk>\r
+User-Agent: Notmuch/0.13.2+106~gb810aee (http://notmuchmail.org) Emacs/23.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 02 Aug 2012 09:59:27 +0200\r
+Message-ID: <87k3xhafmo.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQkEpB4HFZjDaTOjKk7pboetflSxaTQiA242vD+pKJ879Ehn/77Ju/fYyM5UlmV5BqTsThUR\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 02 Aug 2012 07:59:35 -0000\r
+\r
+On Thu, 02 Aug 2012, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> In commit 5d0883e the function notmuch-search-next-thread was changed.\r
+> In particular it only goes to the next message if there is a next\r
+> message. This breaks notmuch-show-archive-thread-then-next. Fix this\r
+> by going to the "next" message whenever we are on a current message.\r
+\r
+Works for me,\r
+J.\r
+\r
+\r
+> ---\r
+>\r
+>> On Sat, 21 Jul 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+>>> At this point, the only remaining functions that don't support\r
+>>> multi-line search result formats are the thread navigation functions.\r
+>>> This patch fixes that by rewriting them in terms of\r
+>>> notmuch-search-result-{beginning,end}.\r
+>>>\r
+>>> This changes the behavior of notmuch-search-previous-thread slightly\r
+>>> so that if point isn't at the beginning of a result, it first moves\r
+>>> point to the beginning of the result.\r
+>>\r
+>> Hi Austin, bisecting suggests this patch (committed as 5d0883e) breaks\r
+>> notmuch-show-archive-thread-then-next and subsequently\r
+>> notmuch-show-advance-and-archive for me. When showing the last thread in\r
+>> the search results, notmuch-show-archive-thread-then-next used to exit\r
+>> to the end of the search buffer. Now it redisplays the current\r
+>> thread. When I hit SPC to cruise through mails, there's no indication\r
+>> that I've reached the end of search results, other than the same thread\r
+>> being displayed over and over.\r
+>\r
+> This might be the correct fix but I am not certain. It doesn't instantly\r
+> break for me! (It looks more similar to what happened before the parent\r
+> patch.)\r
+>\r
+> Best wishes\r
+>\r
+> Mark\r
+>\r
+>\r
+>  emacs/notmuch.el |    2 +-\r
+>  1 files changed, 1 insertions(+), 1 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> index fd1836f..d2d82a9 100644\r
+> --- a/emacs/notmuch.el\r
+> +++ b/emacs/notmuch.el\r
+> @@ -293,7 +293,7 @@ For a mouse binding, return nil."\r
+>  (defun notmuch-search-next-thread ()\r
+>    "Select the next thread in the search results."\r
+>    (interactive)\r
+> -  (when (notmuch-search-get-result (notmuch-search-result-end))\r
+> +  (when (notmuch-search-get-result)\r
+>      (goto-char (notmuch-search-result-end))))\r
+>  \r
+>  (defun notmuch-search-previous-thread ()\r
+> -- \r
+> 1.7.9.1\r