[PATCH v4 2/7] emacs: help: save-match-data

diff --git a/2a/726ef641a9901e1124a9bbc941d02538317243 b/2a/726ef641a9901e1124a9bbc941d02538317243
new file mode 100644 (file)
index 0000000..53fd3ae
--- /dev/null
+++ b/2a/726ef641a9901e1124a9bbc941d02538317243
@@ -0,0 +1,98 @@
+Return-Path: <markwalters1009@gmail.com>\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 E6F1A431FD7\r
+       for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 13:09:21 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 iOdVf57jraqu for <notmuch@notmuchmail.org>;\r
+       Tue, 12 Nov 2013 13:09:14 -0800 (PST)\r
+Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com\r
+ [74.125.82.49])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 3AB81431FCF   for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 13:09:14 -0800\r
+ (PST)\r
+Received: by mail-wg0-f49.google.com with SMTP id x13so2605807wgg.4\r
+       for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 13:09:13 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=+NeEEIgUeu4WjHSxL8tkh5julgWpcSqKo+LYSv+rm84=;\r
+       b=qLmUfddh8ee9LkL/fqo3cGE5YuJOGDb7f+guTy7OxPtsV6ZxulYzMfvXj+3nWPF4iv\r
+       3v08/Pu8AKCxj/fyQH4aIl4yKqILY161zhmQn/GaG4P0vySnw+D5qlXDBGEjnwKJIye3\r
+       ljZXVnamFGs6km40KC+3Oh4KF/lGsLEDVhjBr86cSxs9q65d/qa0Nu5fIHqTpGJ/fYAg\r
+       MbiHeJuNFJOSWJtEZPuYyrneW543SWKR8G0ZZ+laxmi7TTLdBKmKx3EtRt1fCEMOq5ah\r
+       MJGrN3lT3nxbpN1xuUuf6z8MrIA5wa1CXvgB9Q2wVW5MWjC7NKaX4UhKHP/9j+Pr0Vak\r
+       O2eg==\r
+X-Received: by 10.180.20.13 with SMTP id j13mr17563452wie.8.1384287068405;\r
+       Tue, 12 Nov 2013 12:11:08 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id\r
+       c10sm48157218wie.11.2013.11.12.12.11.07 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Tue, 12 Nov 2013 12:11:08 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 2/7] emacs: help: save-match-data\r
+Date: Tue, 12 Nov 2013 20:10:54 +0000\r
+Message-Id: <1384287059-3525-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1384287059-3525-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1384287059-3525-1-git-send-email-markwalters1009@gmail.com>\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, 12 Nov 2013 21:09:22 -0000\r
+\r
+The routines that construct the help page in notmuch-lib rely on\r
+match-data being preserved across some fairly complicated code. This\r
+is currently valid but will not be when this series is finished. Thus\r
+place everything between the string-match and replace-match inside a\r
+save-match-data.\r
+---\r
+ emacs/notmuch-lib.el |   12 +++++++-----\r
+ 1 files changed, 7 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 5e734b3..6abc4ea 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -274,11 +274,13 @@ prefix argument.  PREFIX and TAIL are used internally."\r
+   "Like `substitute-command-keys' but with documentation, not function names."\r
+   (let ((beg 0))\r
+     (while (string-match "\\\\{\\([^}[:space:]]*\\)}" doc beg)\r
+-      (let* ((keymap-name (substring doc (match-beginning 1) (match-end 1)))\r
+-           (keymap (symbol-value (intern keymap-name)))\r
+-           (ua-keys (where-is-internal 'universal-argument keymap t))\r
+-           (desc-list (notmuch-describe-keymap keymap ua-keys))\r
+-           (desc (mapconcat #'identity desc-list "\n")))\r
++      (let ((desc\r
++           (save-match-data\r
++             (let* ((keymap-name (substring doc (match-beginning 1) (match-end 1)))\r
++                    (keymap (symbol-value (intern keymap-name)))\r
++                    (ua-keys (where-is-internal 'universal-argument keymap t))\r
++                    (desc-list (notmuch-describe-keymap keymap ua-keys)))\r
++               (mapconcat #'identity desc-list "\n")))))\r
+       (setq doc (replace-match desc 1 1 doc)))\r
+       (setq beg (match-end 0)))\r
+     doc))\r
+-- \r
+1.7.9.1\r
+\r