1 Return-Path: <amdragon@mit.edu>
\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 32275431FAF
\r
6 for <notmuch@notmuchmail.org>; Mon, 7 Oct 2013 15:49:09 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id r8r8RkppMl6T for <notmuch@notmuchmail.org>;
\r
16 Mon, 7 Oct 2013 15:49:03 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id DD715431FAE
\r
20 for <notmuch@notmuchmail.org>; Mon, 7 Oct 2013 15:49:02 -0700 (PDT)
\r
21 X-AuditID: 1209190f-b7fa08e0000009c6-11-52533a5e106b
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id A1.CB.02502.E5A33525; Mon, 7 Oct 2013 18:49:02 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
26 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r97Mn020026104;
\r
27 Mon, 7 Oct 2013 18:49:00 -0400
\r
28 Received: from drake.dyndns.org (26-4-172.dynamic.csail.mit.edu [18.26.4.172])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r97Mmxlc001039
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Mon, 7 Oct 2013 18:49:00 -0400
\r
34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1VTJbm-0007BG-Gi; Mon, 07 Oct 2013 18:48:58 -0400
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 7/6] emacs: Improved `notmuch-describe-keymap' documentation
\r
40 Date: Mon, 7 Oct 2013 18:48:51 -0400
\r
41 Message-Id: <1381186131-27552-1-git-send-email-amdragon@mit.edu>
\r
42 X-Mailer: git-send-email 1.8.4.rc3
\r
43 In-Reply-To: <1381029768-11883-1-git-send-email-amdragon@mit.edu>
\r
44 References: <1381029768-11883-1-git-send-email-amdragon@mit.edu>
\r
45 X-Brightmail-Tracker:
\r
46 H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6nrhtnFRxk8HSugsX1mzOZHRg9nq26
\r
47 xRzAGMVlk5Kak1mWWqRvl8CVsfVWI2vBBM6K1fs+sTcwrmfvYuTkkBAwkdi89gUzhC0mceHe
\r
48 erYuRi4OIYF9jBKNi3exQjgbGCWOzT/DAlIlJHCYSWLHKS4Iey6jxPkp0iA2m4CGxLb9yxlB
\r
49 bBEBaYmdd2cDNXNwMAuoSfzpUgEJCwv4SNy8s4ANxGYRUJVoa3kJtphXwEHiwJWHLBBHKEks
\r
50 PLWNFcTmFHCU2HzqDSPEKgeJ68ufM05g5F/AyLCKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI10Qv
\r
51 N7NELzWldBMjKGQ4Jfl3MH47qHSIUYCDUYmHN+NoUJAQa2JZcWXuIUZJDiYlUd4ey+AgIb6k
\r
52 /JTKjMTijPii0pzU4kOMEhzMSiK8AkZAOd6UxMqq1KJ8mJQ0B4uSOO9NDvsgIYH0xJLU7NTU
\r
53 gtQimKwMB4eSBG8kyFDBotT01Iq0zJwShDQTByfIcB6g4fNAaniLCxJzizPTIfKnGBWlxHln
\r
54 gyQEQBIZpXlwvbCYfsUoDvSKMO8OkCoeYDqA634FNJgJaLAueyDI4JJEhJRUA2Mtj6egzNTE
\r
55 oobOfo/cWdc6NfetE2U0Fd4eO/3wb9HDEWLrVqzxOHHxSstnJy0hrSMm7adSzvH0h/08Zh22
\r
56 iuPGeaf4U08rvJ/s32qS5dXNVmDGz2c6o0vlU2PMraM5+57tD9yRHtfEzqa8qDrb+w6LxSsB
\r
57 JksNx74FTj3F65ba2IfGrHa5o8RSnJFoqMVcVJwIAPJbaN/EAgAA
\r
58 X-BeenThere: notmuch@notmuchmail.org
\r
59 X-Mailman-Version: 2.1.13
\r
61 List-Id: "Use and development of the notmuch mail system."
\r
62 <notmuch.notmuchmail.org>
\r
63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
64 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
66 List-Post: <mailto:notmuch@notmuchmail.org>
\r
67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
70 X-List-Received-Date: Mon, 07 Oct 2013 22:49:09 -0000
\r
73 emacs/notmuch.el | 11 ++++++++---
\r
74 1 file changed, 8 insertions(+), 3 deletions(-)
\r
76 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
77 index e559472..c47c6b5 100644
\r
78 --- a/emacs/notmuch.el
\r
79 +++ b/emacs/notmuch.el
\r
80 @@ -141,10 +141,15 @@ This is basically just `format-kbd-macro' but we also convert ESC to M-."
\r
81 (concat desc " "))))
\r
83 (defun notmuch-describe-keymap (keymap ua-keys &optional prefix tail)
\r
84 - "Return a list of strings, each describing one key in KEYMAP.
\r
85 + "Return a list of strings, each describing one binding in KEYMAP.
\r
87 -Each string gives a human-readable description of the key and the
\r
88 -first line of documentation for the bound function."
\r
89 +Each string gives a human-readable description of the key and a
\r
90 +one-line description of the bound function. See `notmuch-help'
\r
91 +for an overview of how this documentation is extracted.
\r
93 +UA-KEYS should be a key sequence bound to `universal-argument'.
\r
94 +It will be used to describe bindings of commands that support a
\r
95 +prefix argument. PREFIX and TAIL are used internally."
\r
97 (lambda (key binding)
\r
98 (cond ((mouse-event-p key) nil)
\r