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

diff --git a/f4/c3e6c2524da14781718110efe9fb38dac96052 b/f4/c3e6c2524da14781718110efe9fb38dac96052
new file mode 100644 (file)
index 0000000..c2240de
--- /dev/null
+++ b/f4/c3e6c2524da14781718110efe9fb38dac96052
@@ -0,0 +1,115 @@
+Return-Path: <amdragon@mit.edu>\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 8DBBF41ED71\r
+       for <notmuch@notmuchmail.org>; Thu, 12 Jul 2012 17:45:36 -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 GHvV6l6-yN9r for <notmuch@notmuchmail.org>;\r
+       Thu, 12 Jul 2012 17:45:34 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7802741ED72\r
+       for <notmuch@notmuchmail.org>; Thu, 12 Jul 2012 17:45:30 -0700 (PDT)\r
+X-AuditID: 1209190f-b7f306d0000008b4-9e-4fff6faa0fe2\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id D5.91.02228.AAF6FFF4; Thu, 12 Jul 2012 20:45:30 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q6D0jUS9021131; \r
+       Thu, 12 Jul 2012 20:45:30 -0400\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6D0jSIP010706\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Thu, 12 Jul 2012 20:45:29 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SpU0e-0005SE-O7; Thu, 12 Jul 2012 20:45:28 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 7/7] emacs: Fix navigation of multi-line search result formats\r
+Date: Thu, 12 Jul 2012 20:45:19 -0400\r
+Message-Id: <1342140319-19859-8-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1342140319-19859-1-git-send-email-amdragon@mit.edu>\r
+References: <1342140319-19859-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6nrrsq/7+/Qet0YYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoErY/WEFraC7dwVk/4uZ2lgXM3ZxcjJISFgIjHvyTdGCFtM4sK9\r
+       9WxdjFwcQgL7GCU2bH4C5WxglOic1MEC4Txikuj9tIUVwpnLKDF17VY2kH42AQ2JbfuXg80S\r
+       EZCW2Hl3NlARBwezgJrEny4VkLCwgJ/EjM/7wEpYBFQl5h2/yAJi8wo4SKz+PpMd4gx5iaf3\r
+       +8BGcgo4Smz4coEVxBYCqmk8NpN5AiP/AkaGVYyyKblVurmJmTnFqcm6xcmJeXmpRbomermZ\r
+       JXqpKaWbGEFhwynJv4Px20GlQ4wCHIxKPLy/Y//7C7EmlhVX5h5ilORgUhLldckGCvEl5adU\r
+       ZiQWZ8QXleakFh9ilOBgVhLhXWcPlONNSaysSi3Kh0lJc7AoifNeTbnpLySQnliSmp2aWpBa\r
+       BJOV4eBQkuDlBMaHkGBRanpqRVpmTglCmomDE2Q4D9DwbXkgw4sLEnOLM9Mh8qcYFaXEeS+A\r
+       JARAEhmleXC9sLh+xSgO9Iow706QKh5gSoDrfgU0mAlo8Kyf/0AGlyQipKQaGJ0U5fj3nft+\r
+       IbKG03UVe6/Cl8a/Z5ZHRISXBTr9fSPu8ZvdJDrl3Laig48Ef5jo593rjIubc7uh/rnVXfdL\r
+       x3ty8v8e3zb9xI2jR0KXb1F4sbbj4YFg9obJh3yn7Z+Tw+IcuXNZcqnUygVGS+8lbbTYJxUz\r
+       aebV440nGtb07J+VkVcdprD7SoISS3FGoqEWc1FxIgBHHS6TxgIAAA==\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 00:45:37 -0000\r
+\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
+ 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