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 09333431FD7
\r
6 for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 14:46:34 -0800 (PST)
\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 XbQHPjNUy3J4 for <notmuch@notmuchmail.org>;
\r
16 Tue, 12 Nov 2013 14:46:26 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 51255431FCF
\r
22 for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 14:46:26 -0800 (PST)
\r
23 X-AuditID: 1209190d-b7ef66d000000c40-98-5282afc1d99b
\r
24 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
\r
25 (using TLS with cipher AES256-SHA (256/256 bits))
\r
26 (Client did not present a certificate)
\r
27 by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP
\r
28 id 3D.99.03136.1CFA2825; Tue, 12 Nov 2013 17:46:25 -0500 (EST)
\r
29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
30 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id rACMkOdj025468;
\r
31 Tue, 12 Nov 2013 17:46:25 -0500
\r
32 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
33 (authenticated bits=0)
\r
34 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
35 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id rACMkMDp022443
\r
36 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
\r
37 Tue, 12 Nov 2013 17:46:24 -0500
\r
38 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)
\r
39 (envelope-from <amdragon@mit.edu>)
\r
40 id 1VgMj0-000725-NV; Tue, 12 Nov 2013 17:46:22 -0500
\r
41 Date: Tue, 12 Nov 2013 17:46:22 -0500
\r
42 From: Austin Clements <amdragon@MIT.EDU>
\r
43 To: Mark Walters <markwalters1009@gmail.com>
\r
44 Subject: Re: [PATCH v4 0/7] emacs: help: remap keybindings
\r
45 Message-ID: <20131112224622.GC13399@mit.edu>
\r
46 References: <1384287059-3525-1-git-send-email-markwalters1009@gmail.com>
\r
48 Content-Type: text/plain; charset=us-ascii
\r
49 Content-Disposition: inline
\r
50 In-Reply-To: <1384287059-3525-1-git-send-email-markwalters1009@gmail.com>
\r
51 User-Agent: Mutt/1.5.21 (2010-09-15)
\r
52 X-Brightmail-Tracker:
\r
53 H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IR4hTV1j24vinI4PtkXYvVc3ksrt+cyezA
\r
54 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZUzc/YCp4LpIxbppTg2MCwS6GDk5JARMJPb3
\r
55 f2KDsMUkLtxbD2RzcQgJzGaSWPLkIDuEs5FR4sv161CZ00wSs54vYIRwljBK3P3/gBmkn0VA
\r
56 VWL56sNgs9gENCS27V/OCGKLCOhI3D60gB3EZhaQlvj2u5kJxBYWsJJoW98FVs8LVPPw0W8W
\r
57 EFtIwEPi6JstTBBxQYmTM5+wQPRqSdz49xIozgE2Z/k/DpAwp4CnROObv2AniAqoSEw5uY1t
\r
58 AqPQLCTds5B0z0LoXsDIvIpRNiW3Sjc3MTOnODVZtzg5MS8vtUjXSC83s0QvNaV0EyM4qCV5
\r
59 dzC+O6h0iFGAg1GJh9cipilIiDWxrLgy9xCjJAeTkihvxFqgEF9SfkplRmJxRnxRaU5q8SFG
\r
60 CQ5mJRFe6TVAOd6UxMqq1KJ8mJQ0B4uSOO9NDvsgIYH0xJLU7NTUgtQimKwMB4eSBO+EdUCN
\r
61 gkWp6akVaZk5JQhpJg5OkOE8QMOrQWp4iwsSc4sz0yHypxgVpcR5Z4MkBEASGaV5cL2wpPOK
\r
62 URzoFWHeepAqHmDCgut+BTSYCWiwRTHY4JJEhJRUA2NMjmq0drHOkZT3N63j/k6K8pgo25uv
\r
63 O6W/cnrJzZi+Wzc1m3Nro3+4JthXqzic5d/atOlA9VaZmTUK9jyvVqhvmzjxe9Fdg6Cu3RMK
\r
64 OaS6T+4/ckYzZMUdefXXV19WLo6u6ds6fb3cxeTK0tr6v0cdWDcdSe7jTdc8td9vdlFhr2BR
\r
65 WJ+MuxJLcUaioRZzUXEiAP+aZhAVAwAA
\r
66 Cc: notmuch@notmuchmail.org
\r
67 X-BeenThere: notmuch@notmuchmail.org
\r
68 X-Mailman-Version: 2.1.13
\r
70 List-Id: "Use and development of the notmuch mail system."
\r
71 <notmuch.notmuchmail.org>
\r
72 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
74 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
75 List-Post: <mailto:notmuch@notmuchmail.org>
\r
76 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
77 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
78 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
79 X-List-Received-Date: Tue, 12 Nov 2013 22:46:34 -0000
\r
83 Quoth Mark Walters on Nov 12 at 8:10 pm:
\r
84 > This is v4 of this patch set. v3 is at id:1383932419-12533-1-git-send-email-markwalters1009@gmail.com.
\r
86 > David found a bug in v3 which I tracked down to some match-data being
\r
87 > over-written. This included the bugfix
\r
88 > id:1384076682-16872-1-git-send-email-markwalters1009@gmail.com which
\r
89 > is folded into this series as the second patch.
\r
91 > The diff v3+bugfix is below: it does the save-match-data as Austin
\r
92 > suggested, and it removes an accidental added comment which I put in
\r
93 > when finding the bug.
\r
95 > I have also left off the last "testing patch" (a patch that added some
\r
96 > functionality to make it easier to test the help routine but not
\r
97 > something that should be added to mainline)
\r
103 > diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
104 > index 20ed1fb..0655bdd 100644
\r
105 > --- a/emacs/notmuch-lib.el
\r
106 > +++ b/emacs/notmuch-lib.el
\r
107 > @@ -305,16 +305,15 @@ prefix argument. PREFIX and TAIL are used internally."
\r
108 > (defun notmuch-substitute-command-keys (doc)
\r
109 > "Like `substitute-command-keys' but with documentation, not function names."
\r
111 > - (while (string-match "\\\\{\\([^}[:space:]]*\\)}" doc beg) ;; matches \{not-space}
\r
112 > + (while (string-match "\\\\{\\([^}[:space:]]*\\)}" doc beg)
\r
115 > (let* ((keymap-name (substring doc (match-beginning 1) (match-end 1)))
\r
116 > (keymap (symbol-value (intern keymap-name)))
\r
117 > (ua-keys (where-is-internal 'universal-argument keymap t))
\r
118 > (desc-alist (notmuch-describe-keymap keymap ua-keys keymap))
\r
119 > - (desc-list (mapcar (lambda (arg) (concat (car arg) "\t" (cdr arg))) desc-alist))
\r
120 > - (desc (mapconcat #'identity desc-list "\n")))
\r
122 > + (desc-list (mapcar (lambda (arg) (concat (car arg) "\t" (cdr arg))) desc-alist)))
\r
123 > + (mapconcat #'identity desc-list "\n")))))
\r
124 > (setq doc (replace-match desc 1 1 doc)))
\r
125 > (setq beg (match-end 0)))
\r
131 > Mark Walters (7):
\r
132 > emacs: help: check for nil key binding
\r
133 > emacs: help: save-match-data
\r
134 > emacs: help: remove duplicate bindings
\r
135 > emacs: help: split out notmuch-describe-key as a function
\r
136 > emacs: help: add base-keymap
\r
137 > emacs: help: add a special function to deal with remaps
\r
138 > emacs: tree: use remap for the over-ridden global bindings
\r
140 > emacs/notmuch-lib.el | 85 ++++++++++++++++++++++++++++++++++--------------
\r
141 > emacs/notmuch-tree.el | 8 ++--
\r
142 > 2 files changed, 64 insertions(+), 29 deletions(-)
\r