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 9192D431FB6
\r
6 for <notmuch@notmuchmail.org>; Fri, 11 Oct 2013 06:40:07 -0700 (PDT)
\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 hlxEI1BzFSrf for <notmuch@notmuchmail.org>;
\r
18 Fri, 11 Oct 2013 06:40:02 -0700 (PDT)
\r
19 Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com
\r
20 [74.125.82.52]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
21 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
22 DE450431FAE for <notmuch@notmuchmail.org>; Fri, 11 Oct 2013 06:40:01 -0700
\r
24 Received: by mail-wg0-f52.google.com with SMTP id m15so4249754wgh.19
\r
25 for <notmuch@notmuchmail.org>; Fri, 11 Oct 2013 06:39:59 -0700 (PDT)
\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;
\r
28 bh=PpobWoEVDpgygEquqhqB/U17yvcRxa4jYA6eNVTwUPY=;
\r
29 b=d0CURVMa+11u9PGx+8GWUXKZGzD50zA92jdkSbY/QkWocdswR1pS49gT7/JXb7UWzH
\r
30 LpEIYNJahtYD4dhXmfPoIOlV49JKHdd/RSc6bVmq6JWYm+5jyGzOVL1R9a8YDUX9sADy
\r
31 KD1gLanBUrIz8VLCQDsZZZEkS2keAMfS405fiRTU8nAGdskvZXeuVsltfRUoJwOuVDhz
\r
32 nXqo0O/shF2/egFs6wZ0/KQvj4Snl2smB3U0BuYODWhuJHXuiYGzq2MDXBZ0J9aCsYDi
\r
33 e8d6NYgQd1oJoEYEh6BPeqGvnZs0cpWdDCxlIR9orGAZmYS/qKdyHp6SGsD+0oEG8Qak
\r
35 X-Received: by 10.180.20.77 with SMTP id l13mr3322646wie.40.1381498797939;
\r
36 Fri, 11 Oct 2013 06:39:57 -0700 (PDT)
\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 d11sm5837466wic.4.2013.10.11.06.39.56
\r
39 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Fri, 11 Oct 2013 06:39:57 -0700 (PDT)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH 0/1] emacs: don't show duplicate keys in help.
\r
45 Date: Fri, 11 Oct 2013 14:39:53 +0100
\r
46 Message-Id: <1381498794-17000-1-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Fri, 11 Oct 2013 13:40:07 -0000
\r
62 Previously notmuch-help would show two entries for keys in a parent
\r
63 keymap that were over-ridden in the local keymap. This keeps track of
\r
64 which keys have been seen and thus avoids these spurious duplicate
\r
67 Currently only pick does this but I think we might easily have the
\r
68 problem elsewhere in the future.
\r
70 Since most of the diff is indentation I include a word-diff below
\r
71 (which is why there is a cover letter and single patch).
\r
81 emacs: don't show duplicate keys in help.
\r
83 emacs/notmuch.el | 45 ++++++++++++++++++++++++---------------------
\r
84 1 files changed, 24 insertions(+), 21 deletions(-)
\r
86 word-diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
87 index c47c6b5..4f4e2e7 100644
\r
88 --- a/emacs/notmuch.el
\r
89 +++ b/emacs/notmuch.el
\r
90 @@ -150,8 +150,11 @@ for an overview of how this documentation is extracted.
\r
91 UA-KEYS should be a key sequence bound to `universal-argument'.
\r
92 It will be used to describe bindings of commands that support a
\r
93 prefix argument. PREFIX and TAIL are used internally."
\r
96 (lambda (key binding)
\r
97 + (unless (memq key keys-seen)
\r
98 + (push key keys-seen)
\r
99 (cond ((mouse-event-p key) nil)
\r
102 @@ -169,8 +172,8 @@ prefix argument. PREFIX and TAIL are used internally."
\r
103 (push (concat prefix (format-kbd-macro (vector key)) "\t"
\r
104 (or (and (symbolp binding) (get binding 'notmuch-doc))
\r
105 (notmuch-documentation-first-line binding)))
\r
112 (defun notmuch-substitute-command-keys (doc)
\r