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 84747431FDD
\r
6 for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:18:39 -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 ZNRluIwa++h3 for <notmuch@notmuchmail.org>;
\r
18 Tue, 12 Nov 2013 12:18:33 -0800 (PST)
\r
19 Received: from mail-we0-f178.google.com (mail-we0-f178.google.com
\r
20 [74.125.82.178]) (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 76225431FD7
\r
23 for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:18:27 -0800 (PST)
\r
24 Received: by mail-we0-f178.google.com with SMTP id q59so6441249wes.23
\r
25 for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:18:26 -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=EEaRINw2MVLK36utIg3+Ia+wlP+1H7ZftlNwpDE6GiI=;
\r
29 b=x90D4ctHQDf+6ukXsxGtI8EMo9s2Lg2po2zBbjF8IxNdA4DiAmTKFiG3siF8woIWvs
\r
30 WeS/h4Xz8zqbdo/hz7e7ZyMCHdnIULTyrHTnmdpzpCCh9R+f9UTBC5iA1AUWnkLysiwk
\r
31 WKaP2NIexn2+5OTwTUqNpH2ifoxZMkWbIyE0C3c3I6fC7Oh7/1C/AF/GCHbeOodjde8O
\r
32 VmddwV3PFXCsbkApYdMbPkfDBury/4+cHpeqtmfw6waMG7dtcFnRafBtrxFTA5VyEDst
\r
33 lz6k2LCnAmw050Y7Ro4PMu3rCczkFI/9K4nK55yuReCMdWPX0eGoMIK+vsOZ96RuK8b7
\r
35 X-Received: by 10.180.221.38 with SMTP id qb6mr17564225wic.8.1384287066631;
\r
36 Tue, 12 Nov 2013 12:11:06 -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 qc10sm48003147wic.9.2013.11.12.12.11.05 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Tue, 12 Nov 2013 12:11:06 -0800 (PST)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH v4 1/7] emacs: help: check for nil key binding
\r
45 Date: Tue, 12 Nov 2013 20:10:53 +0000
\r
46 Message-Id: <1384287059-3525-2-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 In-Reply-To: <1384287059-3525-1-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1384287059-3525-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: Tue, 12 Nov 2013 20:18:39 -0000
\r
64 A standard way to unset a key binding is local-unset-key which is equivalent to
\r
65 (define-key (current-local-map) key nil)
\r
67 Currently notmuch-help gives an error and fails if a user has done this.
\r
69 To fix this we only add a help line if the binding is non-nil.
\r
71 emacs/notmuch-lib.el | 2 +-
\r
72 1 files changed, 1 insertions(+), 1 deletions(-)
\r
74 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
75 index 08a86fd..5e734b3 100644
\r
76 --- a/emacs/notmuch-lib.el
\r
77 +++ b/emacs/notmuch-lib.el
\r
78 @@ -254,7 +254,7 @@ prefix argument. PREFIX and TAIL are used internally."
\r
80 (notmuch-describe-keymap
\r
81 binding ua-keys (notmuch-prefix-key-description key) tail)))
\r
84 (when (and ua-keys (symbolp binding)
\r
85 (get binding 'notmuch-prefix-doc))
\r
86 ;; Documentation for prefixed command
\r