--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\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 1BDFB431FAF\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 23:01:03 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ 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 Y9hjm8OcUOjE for <notmuch@notmuchmail.org>;\r
+ Tue, 7 Aug 2012 23:01:01 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id A83AF431FAE\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 23:01:01 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 4A5951002A4; Wed, 8 Aug 2012 09:01:10 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Mark Walters <markwalters1009@gmail.com>,\r
+ Austin Clements <amdragon@MIT.EDU>\r
+Subject: Re: [PATCH v2] emacs: notmuch search bugfix\r
+In-Reply-To: <877gta1x4d.fsf@qmul.ac.uk>\r
+References: <87boinpqfg.fsf@qmul.ac.uk> <20120806234732.GM22601@mit.edu>\r
+ <87pq72bthc.fsf@qmul.ac.uk> <20120807160352.GA2811@mit.edu>\r
+ <877gta1x4d.fsf@qmul.ac.uk>\r
+User-Agent: Notmuch/0.13.2+128~g07453d8 (http://notmuchmail.org) Emacs/23.1.1\r
+ (x86_64-redhat-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Wed, 08 Aug 2012 09:01:10 +0300\r
+Message-ID: <m2ipct9b2x.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Wed, 08 Aug 2012 06:01:03 -0000\r
+\r
+On Tue, Aug 07 2012, Mark Walters <markwalters1009@gmail.com> wrote:\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
+LGTM.\r
+\r
+Tomi\r
+\r
+>\r
+> I think this implements all of Austin's suggestions, and it adds a short\r
+> remark to NEWS (since in unlikely cases it could break users' functions)\r
+> and updates the docstring for notmuch-search. \r
+>\r
+> Best wishes\r
+>\r
+> Mark\r
+>\r
+> NEWS | 3 +++\r
+> emacs/notmuch.el | 12 +++++++-----\r
+> 2 files changed, 10 insertions(+), 5 deletions(-)\r
+>\r
+> diff --git a/NEWS b/NEWS\r
+> index 761b2c1..9916c91 100644\r
+> --- a/NEWS\r
+> +++ b/NEWS\r
+> @@ -55,6 +55,9 @@ user-specified formatting\r
+> you've customized this variable, you may have to change your date\r
+> format from `"%s "` to `"%12s "`.\r
+> \r
+> +The thread-id for the `target-thread` argument for `notmuch-search` should\r
+> +now be supplied without the "thread:" prefix.\r
+> +\r
+> Notmuch 0.13.2 (2012-06-02)\r
+> ===========================\r
+> \r
+> diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> index d2d82a9..7b61e9b 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 (unless bare "thread:") thread))))\r
+> \r
+> (defun notmuch-search-find-thread-id-region (beg end)\r
+> "Return a list of threads for the current region"\r
+> @@ -936,7 +938,7 @@ If `query' is nil, it is read interactively from the minibuffer.\r
+> Other optional parameters are used as follows:\r
+> \r
+> oldest-first: A Boolean controlling the sort order of returned threads\r
+> - target-thread: A thread ID (with the thread: prefix) that will be made\r
+> + target-thread: A thread ID (without the thread: prefix) that will be made\r
+> current if it appears in the search results.\r
+> target-line: The line number to move to if the target thread does not\r
+> appear in the search results."\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 'bare))\r
+> (query notmuch-search-query-string)\r
+> (continuation notmuch-search-continuation))\r
+> (notmuch-kill-this-buffer)\r
+> -- \r
+> 1.7.9.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff