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 1B02E429E32
\r
6 for <notmuch@notmuchmail.org>; Thu, 29 Aug 2013 09:26:25 -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 3vaJoy4zrgmA for <notmuch@notmuchmail.org>;
\r
16 Thu, 29 Aug 2013 09:26:20 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id 57653431FD0
\r
20 for <notmuch@notmuchmail.org>; Thu, 29 Aug 2013 09:26:08 -0700 (PDT)
\r
21 X-AuditID: 1209190d-b7f078e000000937-d0-521f761e8feb
\r
22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
\r
23 by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id A0.0B.02359.E167F125; Thu, 29 Aug 2013 12:26:06 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
26 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id r7TGQ3k9015739;
\r
27 Thu, 29 Aug 2013 12:26:04 -0400
\r
28 Received: from drake.dyndns.org
\r
29 (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com
\r
30 [216.15.114.40]) (authenticated bits=0)
\r
31 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
32 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r7TGQ1UW015006
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Thu, 29 Aug 2013 12:26:02 -0400
\r
35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
36 (envelope-from <amdragon@mit.edu>)
\r
37 id 1VF52n-0007X5-7G; Thu, 29 Aug 2013 12:26:01 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH 9/9] emacs: Move ?, q, s, m, =, and G to the common keymap
\r
41 Date: Thu, 29 Aug 2013 12:25:57 -0400
\r
42 Message-Id: <1377793557-28878-10-git-send-email-amdragon@mit.edu>
\r
43 X-Mailer: git-send-email 1.7.10.4
\r
44 In-Reply-To: <1377793557-28878-1-git-send-email-amdragon@mit.edu>
\r
45 References: <1377793557-28878-1-git-send-email-amdragon@mit.edu>
\r
46 X-Brightmail-Tracker:
\r
47 H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixCmqrStXJh9k0L1By+L6zZnMDowez1bd
\r
48 Yg5gjOKySUnNySxLLdK3S+DKeHz5N0vBX+WKyTNOMzcw/pLtYuTkkBAwkTi79R87hC0mceHe
\r
49 erYuRi4OIYF9jBLnzn9kh3A2MkocubGQFcK5wyRx7NN7KGcuo8TDOR+ZQPrZBDQktu1fzghi
\r
50 iwhIS+y8OxuoiIODWUBN4k+XCkhYWMBL4tOZu2wgNouAqkTLsQNgNq+Ao8TR+a+YIc5QlOh+
\r
51 NgEszgkU77/7lgXEFhJwkPhz8Sn7BEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3SN9HIz
\r
52 S/RSU0o3MYLDRpJ3B+O7g0qHGAU4GJV4eB8GywcJsSaWFVfmHmKU5GBSEuUNLAEK8SXlp1Rm
\r
53 JBZnxBeV5qQWH2KU4GBWEuF9ywmU401JrKxKLcqHSUlzsCiJ8z59ejZQSCA9sSQ1OzW1ILUI
\r
54 JivDwaEkwRtfCtQoWJSanlqRlplTgpBm4uAEGc4DNNwKpIa3uCAxtzgzHSJ/ilFRSpzXDCQh
\r
55 AJLIKM2D64XF9StGcaBXhHnDQKp4gCkBrvsV0GAmoMET8uVABpckIqSkGhjjr+j80F4qMOW0
\r
56 xt1jK/VrLSMNN19askPd7uu9MGOrK2ekf/JeXC+Q9lGmRnnCfevn/V3/LmfedNZP7JmY8uef
\r
57 1R52k6dfPRn7jLZ5LWw8tuT0//YzIU5ieQti5GIns72+5px+ScRGfV5HTdaFCC9lBuHKnFe1
\r
58 OU6eRqW7F5/x/iHF8EmCXU6JpTgj0VCLuag4EQA6kiRexgIAAA==
\r
59 X-BeenThere: notmuch@notmuchmail.org
\r
60 X-Mailman-Version: 2.1.13
\r
62 List-Id: "Use and development of the notmuch mail system."
\r
63 <notmuch.notmuchmail.org>
\r
64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
67 List-Post: <mailto:notmuch@notmuchmail.org>
\r
68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
71 X-List-Received-Date: Thu, 29 Aug 2013 16:26:25 -0000
\r
73 The only user-visible effect of this should be that "G" now works in
\r
74 show mode (previously it was unbound for no apparent reason).
\r
76 emacs/notmuch-hello.el | 6 ------
\r
77 emacs/notmuch-lib.el | 6 ++++++
\r
78 emacs/notmuch-show.el | 5 -----
\r
79 emacs/notmuch.el | 6 ------
\r
80 4 files changed, 6 insertions(+), 17 deletions(-)
\r
82 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
83 index 7a31d73..1d6c3a2 100644
\r
84 --- a/emacs/notmuch-hello.el
\r
85 +++ b/emacs/notmuch-hello.el
\r
86 @@ -520,13 +520,7 @@ Such a list can be computed with `notmuch-hello-query-counts'."
\r
87 (set-keymap-parent map notmuch-common-keymap)
\r
88 (define-key map "v" (lambda () "Display the notmuch version" (interactive)
\r
89 (message "notmuch version %s" (notmuch-version))))
\r
90 - (define-key map "?" 'notmuch-help)
\r
91 - (define-key map "q" 'notmuch-kill-this-buffer)
\r
92 - (define-key map "=" 'notmuch-refresh-this-buffer)
\r
93 - (define-key map "G" 'notmuch-poll-and-refresh-this-buffer)
\r
94 (define-key map (kbd "<C-tab>") 'widget-backward)
\r
95 - (define-key map "m" 'notmuch-mua-new-mail)
\r
96 - (define-key map "s" 'notmuch-search)
\r
98 "Keymap for \"notmuch hello\" buffers.")
\r
99 (fset 'notmuch-hello-mode-map notmuch-hello-mode-map)
\r
100 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
101 index 2bf1d2f..58f3313 100644
\r
102 --- a/emacs/notmuch-lib.el
\r
103 +++ b/emacs/notmuch-lib.el
\r
104 @@ -130,6 +130,12 @@ For example, if you wanted to remove an \"inbox\" tag and add an
\r
106 (defvar notmuch-common-keymap
\r
107 (let ((map (make-sparse-keymap)))
\r
108 + (define-key map "?" 'notmuch-help)
\r
109 + (define-key map "q" 'notmuch-kill-this-buffer)
\r
110 + (define-key map "s" 'notmuch-search)
\r
111 + (define-key map "m" 'notmuch-mua-new-mail)
\r
112 + (define-key map "=" 'notmuch-refresh-this-buffer)
\r
113 + (define-key map "G" 'notmuch-poll-and-refresh-this-buffer)
\r
115 "Keymap shared by all notmuch modes.")
\r
117 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
118 index 9f67340..9d8b785 100644
\r
119 --- a/emacs/notmuch-show.el
\r
120 +++ b/emacs/notmuch-show.el
\r
121 @@ -1265,14 +1265,10 @@ reset based on the original query."
\r
122 (defvar notmuch-show-mode-map
\r
123 (let ((map (make-sparse-keymap)))
\r
124 (set-keymap-parent map notmuch-common-keymap)
\r
125 - (define-key map "?" 'notmuch-help)
\r
126 - (define-key map "q" 'notmuch-kill-this-buffer)
\r
127 (define-key map (kbd "<C-tab>") 'widget-backward)
\r
128 (define-key map (kbd "M-TAB") 'notmuch-show-previous-button)
\r
129 (define-key map (kbd "<backtab>") 'notmuch-show-previous-button)
\r
130 (define-key map (kbd "TAB") 'notmuch-show-next-button)
\r
131 - (define-key map "s" 'notmuch-search)
\r
132 - (define-key map "m" 'notmuch-mua-new-mail)
\r
133 (define-key map "f" 'notmuch-show-forward-message)
\r
134 (define-key map "r" 'notmuch-show-reply-sender)
\r
135 (define-key map "R" 'notmuch-show-reply)
\r
136 @@ -1280,7 +1276,6 @@ reset based on the original query."
\r
137 (define-key map "w" 'notmuch-show-save-attachments)
\r
138 (define-key map "V" 'notmuch-show-view-raw-message)
\r
139 (define-key map "c" 'notmuch-show-stash-map)
\r
140 - (define-key map "=" 'notmuch-refresh-this-buffer)
\r
141 (define-key map "h" 'notmuch-show-toggle-visibility-headers)
\r
142 (define-key map "*" 'notmuch-show-tag-all)
\r
143 (define-key map "-" 'notmuch-show-remove-tag)
\r
144 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
145 index e098bd7..4de6229 100644
\r
146 --- a/emacs/notmuch.el
\r
147 +++ b/emacs/notmuch.el
\r
148 @@ -199,8 +199,6 @@ first line of documentation for the bound function."
\r
149 (defvar notmuch-search-mode-map
\r
150 (let ((map (make-sparse-keymap)))
\r
151 (set-keymap-parent map notmuch-common-keymap)
\r
152 - (define-key map "?" 'notmuch-help)
\r
153 - (define-key map "q" 'notmuch-kill-this-buffer)
\r
154 (define-key map "x" 'notmuch-kill-this-buffer)
\r
155 (define-key map (kbd "<DEL>") 'notmuch-search-scroll-down)
\r
156 (define-key map "b" 'notmuch-search-scroll-down)
\r
157 @@ -211,12 +209,8 @@ first line of documentation for the bound function."
\r
158 (define-key map "n" 'notmuch-search-next-thread)
\r
159 (define-key map "r" 'notmuch-search-reply-to-thread-sender)
\r
160 (define-key map "R" 'notmuch-search-reply-to-thread)
\r
161 - (define-key map "m" 'notmuch-mua-new-mail)
\r
162 - (define-key map "s" 'notmuch-search)
\r
163 (define-key map "o" 'notmuch-search-toggle-order)
\r
164 (define-key map "c" 'notmuch-search-stash-map)
\r
165 - (define-key map "=" 'notmuch-refresh-this-buffer)
\r
166 - (define-key map "G" 'notmuch-poll-and-refresh-this-buffer)
\r
167 (define-key map "t" 'notmuch-search-filter-by-tag)
\r
168 (define-key map "f" 'notmuch-search-filter)
\r
169 (define-key map [mouse-1] 'notmuch-search-show-thread)
\r