Re: [PATCH 7/7] emacs: Fix navigation of multi-line search result formats

diff --git a/05/6fb3d7ac8235b1d08a68faced2d77036b35945 b/05/6fb3d7ac8235b1d08a68faced2d77036b35945
new file mode 100644 (file)
index 0000000..2eb1653
--- /dev/null
+++ b/05/6fb3d7ac8235b1d08a68faced2d77036b35945
@@ -0,0 +1,141 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 AD305431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 10:22:09 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 XDY44YB2jNyv for <notmuch@notmuchmail.org>;\r
+       Fri, 13 Jul 2012 10:22:09 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1488F431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 10:22:09 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SpjZ2-0003WR-Nd; Fri, 13 Jul 2012 18:22:04 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SpjZ2-0003hL-FL; Fri, 13 Jul 2012 18:22:00 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 7/7] emacs: Fix navigation of multi-line search result\r
+       formats\r
+In-Reply-To: <1342140319-19859-8-git-send-email-amdragon@mit.edu>\r
+References: <1342140319-19859-1-git-send-email-amdragon@mit.edu>\r
+       <1342140319-19859-8-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.13.2+63~g1397edd (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 13 Jul 2012 18:21:58 +0100\r
+Message-ID: <871ukfshjd.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 02f16b50efaf1167b85a10dfcd0ddbfe (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Fri, 13 Jul 2012 17:22:09 -0000\r
+\r
+On Fri, 13 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 seems to subtly change the behaviour in the normal case of a single\r
+line result. If point is not at the start of a search result then\r
+notmuch-search-previous-thread moves to the start of the current thread\r
+rather than the previous thread. Is that deliberate?\r
+\r
+As far as I can see show uses p to move to the start of the previous\r
+message so this behaviour is different from there as well. \r
+\r
+I think your choice may be the nicest one (and actually even more so in\r
+show) but thought I would mention it anyway.\r
+\r
+Best wishes \r
+\r
+Mark\r
+\r
+> ---\r
+>  emacs/notmuch.el |   12 +++++++++---\r
+>  1 file changed, 9 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> index f32cfb0..2ece97d 100644\r
+> --- a/emacs/notmuch.el\r
+> +++ b/emacs/notmuch.el\r
+> @@ -287,18 +287,24 @@ For a mouse binding, return nil."\r
+>  (defun notmuch-search-next-thread ()\r
+>    "Select the next thread in the search results."\r
+>    (interactive)\r
+> -  (forward-line 1))\r
+> +  (when (notmuch-search-get-result (notmuch-search-result-end))\r
+> +    (goto-char (notmuch-search-result-end))))\r
+>  \r
+>  (defun notmuch-search-previous-thread ()\r
+>    "Select the previous thread in the search results."\r
+>    (interactive)\r
+> -  (forward-line -1))\r
+> +  (if (notmuch-search-get-result)\r
+> +      (unless (bobp)\r
+> +    (goto-char (notmuch-search-result-beginning (- (point) 1))))\r
+> +    ;; We must be past the end; jump to the last result\r
+> +    (notmuch-search-last-thread)))\r
+>  \r
+>  (defun notmuch-search-last-thread ()\r
+>    "Select the last thread in the search results."\r
+>    (interactive)\r
+>    (goto-char (point-max))\r
+> -  (forward-line -2))\r
+> +  (forward-line -2)\r
+> +  (goto-char (notmuch-search-result-beginning)))\r
+>  \r
+>  (defun notmuch-search-first-thread ()\r
+>    "Select the first thread in the search results."\r
+> -- \r
+> 1.7.10\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r