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 9D244429E39
\r
6 for <notmuch@notmuchmail.org>; Fri, 8 Nov 2013 09:40:45 -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 F4N77WYZBefB for <notmuch@notmuchmail.org>;
\r
18 Fri, 8 Nov 2013 09:40:40 -0800 (PST)
\r
19 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com
\r
20 [209.85.212.171]) (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 82964429E26
\r
23 for <notmuch@notmuchmail.org>; Fri, 8 Nov 2013 09:40:30 -0800 (PST)
\r
24 Received: by mail-wi0-f171.google.com with SMTP id hn9so707778wib.16
\r
25 for <notmuch@notmuchmail.org>; Fri, 08 Nov 2013 09:40:29 -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=I3pSsapdErPHsuia9nam+vrk2WYgmXiJ2CeMVTdHNew=;
\r
29 b=B9U6d2zUmD2p66SIxRfLh9IAqwTMAYAg6vns9L9oXgvHe3GQgJ2kex/P8AP4+LoDea
\r
30 UyaeSBw5kZynabadAwbpY2on/+8XV1+8GylvxL43qrj85aOLZrSiZPoJbiY5AotH1PrM
\r
31 3iCHHroo6jqvXwniXzGb7UHD+HkVL5NGcwLOfR7h3bk9dn525ZTxEx2tBAj+cnniQhsL
\r
32 8/0HLgxCGkNcFzs8atFEVlAo//rvbAd85090go7y+xrTC+qXwkfi8GmImyUJaCE2C+X0
\r
33 OlmsdrnypLniiFJB4au++/JH0d7yVXR3LwM8lRjOgylNznUID10lGDnb0YEMazzNGVIx
\r
35 X-Received: by 10.180.198.79 with SMTP id ja15mr3284404wic.36.1383932429505;
\r
36 Fri, 08 Nov 2013 09:40:29 -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 ey4sm7504302wic.11.2013.11.08.09.40.28
\r
39 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Fri, 08 Nov 2013 09:40:29 -0800 (PST)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH v3 4/7] emacs: help: add base-keymap
\r
45 Date: Fri, 8 Nov 2013 17:40:16 +0000
\r
46 Message-Id: <1383932419-12533-5-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:40:46 -0000
\r
64 To support key remapping in emacs help we need to know the base keymap
\r
65 when looking at the remapping. keep track of this while we recurse
\r
66 down the sub-keymaps in help.
\r
68 emacs/notmuch-lib.el | 6 +++---
\r
69 1 files changed, 3 insertions(+), 3 deletions(-)
\r
71 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
72 index 8852703..a4f481b 100644
\r
73 --- a/emacs/notmuch-lib.el
\r
74 +++ b/emacs/notmuch-lib.el
\r
75 @@ -261,7 +261,7 @@ It does not prepend if ACTUAL-KEY is already listed in TAIL."
\r
79 -(defun notmuch-describe-keymap (keymap ua-keys &optional prefix tail)
\r
80 +(defun notmuch-describe-keymap (keymap ua-keys base-keymap &optional prefix tail)
\r
81 "Return a list of cons cells, each describing one binding in KEYMAP.
\r
83 Each cons cell consists of a string giving a human-readable
\r
84 @@ -278,7 +278,7 @@ prefix argument. PREFIX and TAIL are used internally."
\r
87 (notmuch-describe-keymap
\r
88 - binding ua-keys (notmuch-prefix-key-description key) tail)))
\r
89 + binding ua-keys base-keymap (notmuch-prefix-key-description key) tail)))
\r
91 (setq tail (notmuch-describe-key (vector key) binding prefix ua-keys tail)))))
\r
93 @@ -291,7 +291,7 @@ prefix argument. PREFIX and TAIL are used internally."
\r
94 (let* ((keymap-name (substring doc (match-beginning 1) (match-end 1)))
\r
95 (keymap (symbol-value (intern keymap-name)))
\r
96 (ua-keys (where-is-internal 'universal-argument keymap t))
\r
97 - (desc-alist (notmuch-describe-keymap keymap ua-keys))
\r
98 + (desc-alist (notmuch-describe-keymap keymap ua-keys keymap))
\r
99 (desc-list (mapcar (lambda (arg) (concat (car arg) "\t" (cdr arg))) desc-alist))
\r
100 (desc (mapconcat #'identity desc-list "\n")))
\r
101 (setq doc (replace-match desc 1 1 doc)))
\r