--- /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 52936431FAF\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 09:03:58 -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 73KH8BJ18aqs for <notmuch@notmuchmail.org>;\r
+ Tue, 7 Aug 2012 09:03:57 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+ [18.7.68.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 9964A431FC0\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 09:03:57 -0700 (PDT)\r
+X-AuditID: 12074422-b7f1f6d00000090b-56-50213c6b2d26\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 4A.E6.02315.B6C31205; Tue, 7 Aug 2012 12:03:55 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q77G3soB013642; \r
+ Tue, 7 Aug 2012 12:03:55 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (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 q77G3rS0007508\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 7 Aug 2012 12:03:54 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SymG9-0002qx-6O; Tue, 07 Aug 2012 12:03:53 -0400\r
+Date: Tue, 7 Aug 2012 12:03:52 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Subject: Re: [PATCH] emacs: notmuch search bugfix\r
+Message-ID: <20120807160352.GA2811@mit.edu>\r
+References: <87boinpqfg.fsf@qmul.ac.uk> <20120806234732.GM22601@mit.edu>\r
+ <87pq72bthc.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <87pq72bthc.fsf@qmul.ac.uk>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpkleLIzCtJLcpLzFFi42IR4hTV1s22UQwweDdL0WL1XB6L6zdnMjsw\r
+ eeycdZfd49mqW8wBTFFcNimpOZllqUX6dglcGS8+HmEr+CxSsfD2TrYGxhcCXYycHBICJhKN\r
+ Ox6xQthiEhfurWfrYuTiEBLYxyix6vJZVghnPaPEnVmtTCBVQgInmCSeHJaGSCxhlFj29wYz\r
+ SIJFQEXixPTtLCA2m4CGxLb9yxlBbBEBHYnbhxawg9jMAtIS3343gw0SFjCU2NX1Emw1r4C2\r
+ xNeLj4B6OYCGZkg82mENERaUODnzCQtEq5bEjX8vmUBKQMYs/8cBEuYE2rR8EsQmUaALppzc\r
+ xjaBUWgWku5ZSLpnIXQvYGRexSibklulm5uYmVOcmqxbnJyYl5dapGuql5tZopeaUrqJERTS\r
+ 7C5KOxh/HlQ6xCjAwajEw3uBSyFAiDWxrLgy9xCjJAeTkiivsbligBBfUn5KZUZicUZ8UWlO\r
+ avEhRgkOZiUR3sM7gcp5UxIrq1KL8mFS0hwsSuK811Ju+gsJpCeWpGanphakFsFkZTg4lCR4\r
+ N1kDDRUsSk1PrUjLzClBSDNxcIIM5wEavhWkhre4IDG3ODMdIn+KUVFKnHcFSEIAJJFRmgfX\r
+ C0s5rxjFgV4R5uW2AKriAaYruO5XQIOZgAZ7y8uBDC5JREhJNTCqqFYcXZ116O2BhCq/eXdS\r
+ g1/v6mWUmmgkvk4gWGTTLw1OAeFnhcxhO/e31acveO3O++2Uze7y29qtM8pXsYka+dQaO88/\r
+ WnCu/ZS0h+i/5c67Hspctmfa8HtR53Q1ZkGrl4cWhwR++tit4Dv3MWtS6IHwZ3NUnh/9PD9A\r
+ t1o7okZ5tZuOcpsSS3FGoqEWc1FxIgCc7jvXFAMAAA==\r
+Cc: notmuch@notmuchmail.org\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: Tue, 07 Aug 2012 16:03:58 -0000\r
+\r
+Quoth Mark Walters on Aug 07 at 4:40 pm:\r
+> \r
+> The recent change to use json for notmuch-search.el introduced a bug\r
+> in the code for keeping position on refresh. The problem is a\r
+> comparison between (plist-get result :thread) and a thread-id returned\r
+> by notmuch-search-find-thread-id: the latter is prefixed with\r
+> "thread:"\r
+> \r
+> We fix this by adding an option to notmuch-search-find-thread-id to\r
+> return the bare thread-id. It appears that notmuch-search-refresh-view\r
+> is the only caller of notmuch-search that supplies a thread-id so this\r
+> change should be safe (but could theoretically break users .emacs\r
+> functions).\r
+> ---\r
+> \r
+> This is a different version of the bugfix suggested in the parent to\r
+> this thread. I think it is nicer but there is a slight risk of breaking\r
+> users .emacs lisp functions.\r
+> \r
+> In general I think the thread: prefix should be present where the term\r
+> is "really" a search term, but absent when it is must be a thread-id,\r
+> and this fits with that idea.\r
+\r
+Agreed.\r
+\r
+> With 0.14 freeze pretty close it might be best to apply this to master\r
+> and the simpler no breakage option (in id:"87boinpqfg.fsf@qmul.ac.uk")\r
+> to the branch.\r
+> \r
+> Best wishes \r
+> \r
+> Mark\r
+> \r
+> emacs/notmuch.el | 10 ++++++----\r
+> 1 files changed, 6 insertions(+), 4 deletions(-)\r
+> \r
+> diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> index d2d82a9..0fff58a 100644\r
+> --- a/emacs/notmuch.el\r
+> +++ b/emacs/notmuch.el\r
+> @@ -475,10 +475,12 @@ BEG."\r
+> (push (plist-get (notmuch-search-get-result pos) property) output)))\r
+> output))\r
+> \r
+> -(defun notmuch-search-find-thread-id ()\r
+> - "Return the thread for the current thread"\r
+> +(defun notmuch-search-find-thread-id (&optional bare)\r
+> + "Return the thread for the current thread\r
+> +\r
+> +If BARE is set then do not prefix with \"thread:\""\r
+> (let ((thread (plist-get (notmuch-search-get-result) :thread)))\r
+> - (when thread (concat "thread:" thread))))\r
+> + (when thread (concat (when (not bare) "thread:") thread))))\r
+\r
+(unless bare "thread:")?\r
+\r
+> \r
+> (defun notmuch-search-find-thread-id-region (beg end)\r
+> "Return a list of threads for the current region"\r
+> @@ -993,7 +995,7 @@ same relative position within the new buffer."\r
+> (interactive)\r
+> (let ((target-line (line-number-at-pos))\r
+> (oldest-first notmuch-search-oldest-first)\r
+> - (target-thread (notmuch-search-find-thread-id))\r
+> + (target-thread (notmuch-search-find-thread-id t))\r
+\r
+Perhaps pass 'bare instead of t to make this self-documenting?\r
+\r
+> (query notmuch-search-query-string)\r
+> (continuation notmuch-search-continuation))\r
+> (notmuch-kill-this-buffer)\r
projects / notmuch-archives.git / commitdiff