1 Return-Path: <nelhage@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 56A934196F4
\r
6 for <notmuch@notmuchmail.org>; Thu, 13 May 2010 19:46:45 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5
\r
12 tests=[BAYES_00=-1.9] autolearn=ham
\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 DL5rxnRTLs+G for <notmuch@notmuchmail.org>;
\r
16 Thu, 13 May 2010 19:46:31 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id CA9AE4196F0
\r
20 for <notmuch@notmuchmail.org>; Thu, 13 May 2010 19:46:31 -0700 (PDT)
\r
21 X-AuditID: 1209190c-b7bd2ae000005d05-c7-4becb98740f1
\r
22 Received: from mailhub-auth-3.mit.edu (MAILHUB-AUTH-3.MIT.EDU [18.9.21.43])
\r
23 by dmz-mailsec-scanner-1.mit.edu (Symantec Brightmail Gateway) with
\r
24 SMTP id A3.44.23813.789BCEB4; Thu, 13 May 2010 22:46:31 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id o4E2kVb9030879;
\r
27 Thu, 13 May 2010 22:46:31 -0400
\r
28 Received: from PHANATIQUE.MIT.EDU (c-71-192-160-118.hsd1.nh.comcast.net
\r
29 [71.192.160.118]) (authenticated bits=0)
\r
30 (User authenticated as nelhage@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id o4E2kTjc023163
\r
32 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
\r
33 Thu, 13 May 2010 22:46:30 -0400 (EDT)
\r
34 From: Nelson Elhage <nelhage@ksplice.com>
\r
35 To: notmuch@notmuchmail.org
\r
36 Subject: [PATCH] emacs: notmuch-hello: Use our own keymap.
\r
37 Date: Thu, 13 May 2010 22:46:15 -0400
\r
38 Message-Id: <1273805175-6660-1-git-send-email-nelhage@ksplice.com>
\r
39 X-Mailer: git-send-email 1.6.6.30.g1e6fd
\r
40 X-Brightmail-Tracker: AAAAARQpM2I=
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Fri, 14 May 2010 02:46:45 -0000
\r
55 Previously, we were adding our bindings directly to `widget-keymap',
\r
56 resulting in them being shared by anything else that used that keymap.
\r
58 emacs/notmuch-hello.el | 22 ++++++++++++++--------
\r
59 1 files changed, 14 insertions(+), 8 deletions(-)
\r
61 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
62 index 6a1c56e..56906c8 100644
\r
63 --- a/emacs/notmuch-hello.el
\r
64 +++ b/emacs/notmuch-hello.el
\r
67 (defvar notmuch-hello-recent-searches nil)
\r
69 +(defvar notmuch-hello-mode-map
\r
70 + (let ((map (make-sparse-keymap)))
\r
71 + (set-keymap-parent map widget-keymap)
\r
72 + (define-key map "=" 'notmuch-hello-update)
\r
73 + (define-key map "G" 'notmuch-hello-poll-and-update)
\r
74 + (define-key map "m" 'notmuch-mua-mail)
\r
75 + (define-key map "q" '(lambda () (interactive) (kill-buffer (current-buffer))))
\r
76 + (define-key map "s" 'notmuch-hello-goto-search)
\r
77 + (define-key map "v" '(lambda () (interactive)
\r
78 + (message "notmuch version %s" (notmuch-version))))
\r
80 + "Keymap for notmuch-hello buffer")
\r
82 (defun notmuch-hello-remember-search (search)
\r
83 (if (not (member search notmuch-hello-recent-searches))
\r
84 (push search notmuch-hello-recent-searches))
\r
85 @@ -397,14 +410,7 @@ diagonal."
\r
86 (let ((fill-column (- (window-width) notmuch-hello-indent)))
\r
87 (center-region start (point))))
\r
89 - (use-local-map widget-keymap)
\r
90 - (local-set-key "=" 'notmuch-hello-update)
\r
91 - (local-set-key "G" 'notmuch-hello-poll-and-update)
\r
92 - (local-set-key "m" 'notmuch-mua-mail)
\r
93 - (local-set-key "q" '(lambda () (interactive) (kill-buffer (current-buffer))))
\r
94 - (local-set-key "s" 'notmuch-hello-goto-search)
\r
95 - (local-set-key "v" '(lambda () (interactive)
\r
96 - (message "notmuch version %s" (notmuch-version))))
\r
97 + (use-local-map notmuch-hello-mode-map)
\r