--- /dev/null
+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 BFC3542119C\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:41 -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 56y1A8wRu6JB for <notmuch@notmuchmail.org>;\r
+ Fri, 13 Jul 2012 20:43:39 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+ [18.9.25.13])\r
+ by olra.theworths.org (Postfix) with ESMTP id AB122431FC3\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jul 2012 20:43:39 -0700 (PDT)\r
+X-AuditID: 1209190d-b7fd56d000000933-f6-5000eaebdbf7\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 65.89.02355.BEAE0005; Fri, 13 Jul 2012 23:43:39 -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 q6E3hdST026808; \r
+ Fri, 13 Jul 2012 23:43:39 -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 q6E3hbQP021334\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Fri, 13 Jul 2012 23:43:38 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SptGb-0000aA-22; Fri, 13 Jul 2012 23:43:37 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 7/7] emacs: Fix navigation of multi-line search result\r
+ formats\r
+Date: Fri, 13 Jul 2012 23:43:26 -0400\r
+Message-Id: <1342237406-32507-8-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1342237406-32507-1-git-send-email-amdragon@mit.edu>\r
+References: <1342140319-19859-1-git-send-email-amdragon@mit.edu>\r
+ <1342237406-32507-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixG6nrvv6FUOAwaoXPBar5/JYXL85k9mB\r
+ yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgypi1/wlLwWueikPtIQ2M+7i6GDk5JARMJA5t\r
+ v8sIYYtJXLi3nq2LkYtDSGAfo0Rby1UmCGcDo8Sz1t1QmUdMEqsbd7FAOHMZJQ5+mswC0s8m\r
+ oCGxbf9ysFkiAtISO+/OZgWxmQUcJT7vX8QGYgsLBEosWPWaHcRmEVCVONo4iRnE5hVwkDh6\r
+ 6g4rxB3yEk/v94HVcwL1tvXeBpspJFAucf3bGqYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm\r
+ 5aUW6Rrp5WaW6KWmlG5iBAUSpyTvDsZ3B5UOMQpwMCrx8Kb6MwQIsSaWFVfmHmKU5GBSEuXl\r
+ BYahEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRFe8zagHG9KYmVValE+TEqag0VJnPdKyk1/IYH0\r
+ xJLU7NTUgtQimKwMB4eSBK8wyFDBotT01Iq0zJwShDQTByfIcB6g4dIgNbzFBYm5xZnpEPlT\r
+ jIpS4ryXXwIlBEASGaV5cL2wSH/FKA70ijCvDUg7DzBJwHW/AhrMBDR41s9//kCDSxIRUlIN\r
+ jH1RbtNc7ixkvbXknGmAf8ZkH9Yvh81dz9ZtuGXIkNWiK3mG43r33hcVzyPuRm5guv3ht6fE\r
+ udNRJY+urT1rt0r8vez6KRuLri6I/7frv084a+rK95+O3TnIIX+p39zae0LAp/uv5E5wuWeW\r
+ r2J7vidxT5R7/B6X43ab7wTx7K59oHvgw77pH/OVWIozEg21mIuKEwGrUotRzwIAAA==\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: Sat, 14 Jul 2012 03:43:42 -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
+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
+ 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 d0a8021..7302fa7 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
projects / notmuch-archives.git / commitdiff