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 55BCE421161
\r
6 for <notmuch@notmuchmail.org>; Fri, 8 Nov 2013 09:40:47 -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 bXtz0wkIqxGg for <notmuch@notmuchmail.org>;
\r
18 Fri, 8 Nov 2013 09:40:41 -0800 (PST)
\r
19 Received: from mail-we0-f174.google.com (mail-we0-f174.google.com
\r
20 [74.125.82.174]) (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 8397A429E28
\r
23 for <notmuch@notmuchmail.org>; Fri, 8 Nov 2013 09:40:32 -0800 (PST)
\r
24 Received: by mail-we0-f174.google.com with SMTP id p61so2271091wes.19
\r
25 for <notmuch@notmuchmail.org>; Fri, 08 Nov 2013 09:40:31 -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=CZpEYw4ni+J0l9LmGehEJtzpuV7m3J6oqoO4RMRsLYM=;
\r
29 b=RuYXoHauWA4kWE47K15TbUGDYANtjTDY723L/66Rk9TA9WRTThPOgZx4+defTAz5Y+
\r
30 jN2SChJKEM2TowkGf3lBbAbIr+ENL4aoHqOknmnRSlpu5GpYqU8BKRlB14h3pSVHqj9g
\r
31 q4RpIqp8ydNAmSkaA3hmAZO3SpZytBuxTnf9cltv/jCuejtczkM9M3JOZ5fA8pdL1QrN
\r
32 7VK01dtY+Tc8M9BhISbdj2u43qOI4QC9sJ/z2r7GVd20B2c88zb1v3NhKuV9+43Muzh4
\r
33 1mSlQJ8VL+Ii6xkVyJPCkicvN2jlQQlwLh9j01ctjMeiXqVFjMr5RoLAelHKg+URanuQ
\r
35 X-Received: by 10.180.208.49 with SMTP id mb17mr3302365wic.64.1383932431558;
\r
36 Fri, 08 Nov 2013 09:40:31 -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 c10sm7507567wie.11.2013.11.08.09.40.30
\r
39 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Fri, 08 Nov 2013 09:40:31 -0800 (PST)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH v3 5/7] emacs: help: add a special function to deal with
\r
46 Date: Fri, 8 Nov 2013 17:40:17 +0000
\r
47 Message-Id: <1383932419-12533-6-git-send-email-markwalters1009@gmail.com>
\r
48 X-Mailer: git-send-email 1.7.9.1
\r
49 In-Reply-To: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>
\r
50 References: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>
\r
51 X-BeenThere: notmuch@notmuchmail.org
\r
52 X-Mailman-Version: 2.1.13
\r
54 List-Id: "Use and development of the notmuch mail system."
\r
55 <notmuch.notmuchmail.org>
\r
56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
59 List-Post: <mailto:notmuch@notmuchmail.org>
\r
60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
63 X-List-Received-Date: Fri, 08 Nov 2013 17:40:47 -0000
\r
65 remaps are a rather unusual keymap consisting of "first key" 'remap
\r
66 and then "second-key" the remapped-function. Thus we do the
\r
67 documentation for it separately.
\r
69 emacs/notmuch-lib.el | 22 ++++++++++++++++++++--
\r
70 1 files changed, 20 insertions(+), 2 deletions(-)
\r
72 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
73 index a4f481b..4b3a86e 100644
\r
74 --- a/emacs/notmuch-lib.el
\r
75 +++ b/emacs/notmuch-lib.el
\r
76 @@ -261,6 +261,21 @@ It does not prepend if ACTUAL-KEY is already listed in TAIL."
\r
80 +(defun notmuch-describe-remaps (remap-keymap ua-keys base-keymap prefix tail)
\r
81 + ;; Remappings are represented as a binding whose first "event" is
\r
82 + ;; 'remap. Hence, if the keymap has any remappings, it will have a
\r
83 + ;; binding whose "key" is 'remap, and whose "binding" is itself a
\r
84 + ;; keymap that maps not from keys to commands, but from old (remapped)
\r
85 + ;; functions to the commands to use in their stead.
\r
87 + (lambda (command binding)
\r
89 + (lambda (actual-key)
\r
90 + (setq tail (notmuch-describe-key actual-key binding prefix ua-keys tail)))
\r
91 + (where-is-internal command base-keymap)))
\r
95 (defun notmuch-describe-keymap (keymap ua-keys base-keymap &optional prefix tail)
\r
96 "Return a list of cons cells, each describing one binding in KEYMAP.
\r
98 @@ -277,8 +292,11 @@ prefix argument. PREFIX and TAIL are used internally."
\r
99 (cond ((mouse-event-p key) nil)
\r
102 - (notmuch-describe-keymap
\r
103 - binding ua-keys base-keymap (notmuch-prefix-key-description key) tail)))
\r
104 + (if (eq key 'remap)
\r
105 + (notmuch-describe-remaps
\r
106 + binding ua-keys base-keymap prefix tail)
\r
107 + (notmuch-describe-keymap
\r
108 + binding ua-keys base-keymap (notmuch-prefix-key-description key) tail))))
\r
110 (setq tail (notmuch-describe-key (vector key) binding prefix ua-keys tail)))))
\r