--- /dev/null
+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 7C13F431FC2\r
+ for <notmuch@notmuchmail.org>; Sun, 10 Nov 2013 01:44:56 -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 ecEm8Z0nGG03 for <notmuch@notmuchmail.org>;\r
+ Sun, 10 Nov 2013 01:44:50 -0800 (PST)\r
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com\r
+ [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id C2307431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 10 Nov 2013 01:44:49 -0800 (PST)\r
+Received: by mail-wi0-f169.google.com with SMTP id cb5so1278423wib.0\r
+ for <notmuch@notmuchmail.org>; Sun, 10 Nov 2013 01:44:48 -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=7jpbeBLoh0GyU8mdI5OgUKAbKAO5H5xZ2MzgvOP3y2s=;\r
+ b=HEarD/ePFDollGjStg0C0RW5UA4qts1YdkzqWeadGMaxXclcGmVhIX2XgNPk6oQPdR\r
+ OdvCzHipntaQLIQfEw131F63blaayAFONSC4qFiQafYSB2V1/0N6DRa0eStv/mOz1j9c\r
+ kATC2bGEIBfZWrBnEOL79c2o5vhlhJyd/mPTyq1nwe3jzLU+7NuaFJUAwzkQ2fwPIyyV\r
+ SNyI0pKN17gnpSRq7ZNKHBtr4vm2rJAJtW6+ecV62axQ8qx7GliKI3If0gA+IhhojyAs\r
+ gtTWM88sdRGRFAo36M8PxbD78T/xp2Fm1csY9lcXQaOkmtqqvsXSvyuE7FW+9NOt2/L6\r
+ EOlg==\r
+X-Received: by 10.180.75.142 with SMTP id c14mr8320132wiw.54.1384076687162;\r
+ Sun, 10 Nov 2013 01:44:47 -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 hv5sm22822963wib.2.2013.11.10.01.44.46\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sun, 10 Nov 2013 01:44:46 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: help: bugfix\r
+Date: Sun, 10 Nov 2013 09:44:42 +0000\r
+Message-Id: <1384076682-16872-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1383932419-12533-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: Sun, 10 Nov 2013 09:44:56 -0000\r
+\r
+Hi\r
+\r
+David found a bug in the this remap/help series. He has a global\r
+keybinding of "C-c s" for notmuch-search and this causes help in\r
+tree-mode to hang.\r
+\r
+I have mostly diagnosed this: the problem comes that all the construct\r
+help routines are inside a string-match/replace-match pair. Somewhere\r
+in these routines the match-data is being stomped on (but I have to\r
+admit I am not sure where).\r
+\r
+In any case putting the construct help routines inside a\r
+save-match-data seems to fix it.\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
+Any comments gratefully received!\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+---\r
+ emacs/notmuch-lib.el | 17 ++++++++++-------\r
+ 1 files changed, 10 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 7b8acb3..e98e073 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -305,13 +305,16 @@ prefix argument. PREFIX and TAIL are used internally."\r
+ (defun notmuch-substitute-command-keys (doc)\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-alist (notmuch-describe-keymap keymap ua-keys keymap))\r
+- (desc-list (mapcar (lambda (arg) (concat (car arg) "\t" (cdr arg))) desc-alist))\r
+- (desc (mapconcat #'identity desc-list "\n")))\r
++ (while (string-match "\\\\{\\([^}[:space:]]*\\)}" doc beg) ;; matches \{not-space}\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-alist (notmuch-describe-keymap keymap ua-keys keymap))\r
++ (desc-list (mapcar (lambda (arg) (concat (car arg) "\t" (cdr arg))) desc-alist))\r
++ (desc (mapconcat #'identity desc-list "\n")))\r
++ desc))))\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
projects / notmuch-archives.git / commitdiff