1 Return-Path: <markwalters1009@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id AE8CD421163
\r
6 for <notmuch@notmuchmail.org>; Fri, 8 Nov 2013 09:41:03 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id NX4ZiJK0g9gI for <notmuch@notmuchmail.org>;
\r
18 Fri, 8 Nov 2013 09:40:57 -0800 (PST)
\r
19 Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com
\r
20 [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 0E41A429E43
\r
23 for <notmuch@notmuchmail.org>; Fri, 8 Nov 2013 09:40:35 -0800 (PST)
\r
24 Received: by mail-wi0-f173.google.com with SMTP id ey11so2523902wid.12
\r
25 for <notmuch@notmuchmail.org>; Fri, 08 Nov 2013 09:40:35 -0800 (PST)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:in-reply-to:references;
\r
28 bh=TPO5uoISxoKmkXwOqEpM1jY+kSFomHAPJjUEKk6wQkU=;
\r
29 b=p4mz+t3uX5SM+F9JRykzbQacsrmRdJdbN8WaPGDpZVowywj0lORRIXk7iG2UDUvY+J
\r
30 4U1b4tLjfaFO57tZLLPMDvwr2SF3r4tfY1pg+uW6um3/MIWJA6hhBX+7aaBEqTBa2r7q
\r
31 OnpfIztMSsblrBAa7xBGCqxpnDe4MOD2dyRnsMim29mXqZTmKD3krmBcK0qHHtACOAzd
\r
32 KPyfYl0WFUWYlFzmoG0s1jhJbgPDoKVPfUkiSfeOdVxzCt7h3OHSCwNkBboV+J1bugQS
\r
33 cPFgpuaQUr2FnnUvx3Kx/84wrcIHKa7pAKa7tS9qfQ1V7JpEpD2VURebcHzb1iK0aE0c
\r
35 X-Received: by 10.180.12.111 with SMTP id x15mr3382985wib.0.1383932434992;
\r
36 Fri, 08 Nov 2013 09:40:34 -0800 (PST)
\r
37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
\r
38 by mx.google.com with ESMTPSA id
\r
39 bs15sm7508578wib.10.2013.11.08.09.40.34 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Fri, 08 Nov 2013 09:40:34 -0800 (PST)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH v3 7/7] emacs: help: base-keymap-test-help
\r
45 Date: Fri, 8 Nov 2013 17:40:19 +0000
\r
46 Message-Id: <1383932419-12533-8-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 In-Reply-To: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>
\r
50 X-BeenThere: notmuch@notmuchmail.org
\r
51 X-Mailman-Version: 2.1.13
\r
53 List-Id: "Use and development of the notmuch mail system."
\r
54 <notmuch.notmuchmail.org>
\r
55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
58 List-Post: <mailto:notmuch@notmuchmail.org>
\r
59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
62 X-List-Received-Date: Fri, 08 Nov 2013 17:41:04 -0000
\r
64 Add an argument to notmuch-help for the mode to display help for.
\r
65 This aids testing of the base-keymap case in remapping in emacs help.
\r
67 It is only intended for testing, ie not for master (but it does no harm)
\r
69 emacs/notmuch-lib.el | 4 ++--
\r
70 1 files changed, 2 insertions(+), 2 deletions(-)
\r
72 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
73 index 4b3a86e..7b8acb3 100644
\r
74 --- a/emacs/notmuch-lib.el
\r
75 +++ b/emacs/notmuch-lib.el
\r
76 @@ -316,7 +316,7 @@ prefix argument. PREFIX and TAIL are used internally."
\r
77 (setq beg (match-end 0)))
\r
80 -(defun notmuch-help ()
\r
81 +(defun notmuch-help (&optional mode)
\r
82 "Display help for the current notmuch mode.
\r
84 This is similar to `describe-function' for the current major
\r
85 @@ -328,7 +328,7 @@ A command that supports a prefix argument can explicitly document
\r
86 its prefixed behavior by setting the 'notmuch-prefix-doc property
\r
87 of its command symbol."
\r
89 - (let* ((mode major-mode)
\r
90 + (let* ((mode (or mode major-mode))
\r
91 (doc (substitute-command-keys (notmuch-substitute-command-keys (documentation mode t)))))
\r
92 (with-current-buffer (generate-new-buffer "*notmuch-help*")
\r