--- /dev/null
+Return-Path: <david@tethera.net>\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 5739E431FD2\r
+ for <notmuch@notmuchmail.org>; Sun, 10 Nov 2013 03:54:02 -0800 (PST)\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 cvU5Mqw7b-ph for <notmuch@notmuchmail.org>;\r
+ Sun, 10 Nov 2013 03:53:57 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+ (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 9CA5B431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 10 Nov 2013 03:53:57 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1VfTaS-0003TH-8G; Sun, 10 Nov 2013 07:53:52 -0400\r
+Received: (nullmailer pid 30243 invoked by uid 1000); Sun, 10 Nov 2013\r
+ 11:53:48 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: help: bugfix\r
+In-Reply-To: <1384076682-16872-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>\r
+ <1384076682-16872-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.16+161~gd941536 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 10 Nov 2013 07:53:48 -0400\r
+Message-ID: <87bo1s1nhv.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 10 Nov 2013 11:54:02 -0000\r
+\r
+Mark Walters <markwalters1009@gmail.com> writes:\r
+>\r
+> This version is a bit ugly: I am not sure of the best way to deal with\r
+> the save-match-data macro. (I think it is best to have it round\r
+> everything that happens between finding the match and replacing the\r
+> match to avoid anything similar in future).\r
+>\r
+> This applies on top of the parent series.\r
+\r
+This seems to fix the problem for me.\r
+\r
+d\r