[PATCH v3 7/7] emacs: help: base-keymap-test-help

diff --git a/a4/c4fd34655134cc7863d4c5fe2a52f6ac2f840b b/a4/c4fd34655134cc7863d4c5fe2a52f6ac2f840b
new file mode 100644 (file)
index 0000000..8a1cbac
--- /dev/null
+++ b/a4/c4fd34655134cc7863d4c5fe2a52f6ac2f840b
@@ -0,0 +1,96 @@
+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 AE8CD421163\r
+       for <notmuch@notmuchmail.org>; Fri,  8 Nov 2013 09:41:03 -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 NX4ZiJK0g9gI for <notmuch@notmuchmail.org>;\r
+       Fri,  8 Nov 2013 09:40:57 -0800 (PST)\r
+Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
+       [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0E41A429E43\r
+       for <notmuch@notmuchmail.org>; Fri,  8 Nov 2013 09:40:35 -0800 (PST)\r
+Received: by mail-wi0-f173.google.com with SMTP id ey11so2523902wid.12\r
+       for <notmuch@notmuchmail.org>; Fri, 08 Nov 2013 09:40:35 -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=TPO5uoISxoKmkXwOqEpM1jY+kSFomHAPJjUEKk6wQkU=;\r
+       b=p4mz+t3uX5SM+F9JRykzbQacsrmRdJdbN8WaPGDpZVowywj0lORRIXk7iG2UDUvY+J\r
+       4U1b4tLjfaFO57tZLLPMDvwr2SF3r4tfY1pg+uW6um3/MIWJA6hhBX+7aaBEqTBa2r7q\r
+       OnpfIztMSsblrBAa7xBGCqxpnDe4MOD2dyRnsMim29mXqZTmKD3krmBcK0qHHtACOAzd\r
+       KPyfYl0WFUWYlFzmoG0s1jhJbgPDoKVPfUkiSfeOdVxzCt7h3OHSCwNkBboV+J1bugQS\r
+       cPFgpuaQUr2FnnUvx3Kx/84wrcIHKa7pAKa7tS9qfQ1V7JpEpD2VURebcHzb1iK0aE0c\r
+       L6BA==\r
+X-Received: by 10.180.12.111 with SMTP id x15mr3382985wib.0.1383932434992;\r
+       Fri, 08 Nov 2013 09:40:34 -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
+       bs15sm7508578wib.10.2013.11.08.09.40.34 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 08 Nov 2013 09:40:34 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 7/7] emacs: help: base-keymap-test-help\r
+Date: Fri,  8 Nov 2013 17:40:19 +0000\r
+Message-Id: <1383932419-12533-8-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: Fri, 08 Nov 2013 17:41:04 -0000\r
+\r
+Add an argument to notmuch-help for the mode to display help for.\r
+This aids testing of the base-keymap case in remapping in emacs help.\r
+\r
+It is only intended for testing, ie not for master (but it does no harm)\r
+---\r
+ emacs/notmuch-lib.el |    4 ++--\r
+ 1 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 4b3a86e..7b8acb3 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -316,7 +316,7 @@ prefix argument.  PREFIX and TAIL are used internally."\r
+       (setq beg (match-end 0)))\r
+     doc))\r
+ \r
+-(defun notmuch-help ()\r
++(defun notmuch-help (&optional mode)\r
+   "Display help for the current notmuch mode.\r
+ \r
+ This is similar to `describe-function' for the current major\r
+@@ -328,7 +328,7 @@ A command that supports a prefix argument can explicitly document\r
+ its prefixed behavior by setting the 'notmuch-prefix-doc property\r
+ of its command symbol."\r
+   (interactive)\r
+-  (let* ((mode major-mode)\r
++  (let* ((mode (or mode major-mode))\r
+        (doc (substitute-command-keys (notmuch-substitute-command-keys (documentation mode t)))))\r
+     (with-current-buffer (generate-new-buffer "*notmuch-help*")\r
+       (insert doc)\r
+-- \r
+1.7.9.1\r
+\r