1 Return-Path: <dme@dme.org>
\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 arlo.cworth.org (Postfix) with ESMTP id 0EACC6DE1862
\r
6 for <notmuch@notmuchmail.org>; Mon, 14 Mar 2016 01:35:56 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.153 tagged_above=-999 required=5
\r
12 tests=[AWL=-0.086, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,
\r
13 RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,
\r
14 RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001]
\r
16 Received: from arlo.cworth.org ([127.0.0.1])
\r
17 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
18 with ESMTP id peqf_iivyE_F for <notmuch@notmuchmail.org>;
\r
19 Mon, 14 Mar 2016 01:35:54 -0700 (PDT)
\r
20 Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com
\r
21 [74.125.82.46]) by arlo.cworth.org (Postfix) with ESMTPS id 71D5D6DE1855 for
\r
22 <notmuch@notmuchmail.org>; Mon, 14 Mar 2016 01:35:53 -0700 (PDT)
\r
23 Received: by mail-wm0-f46.google.com with SMTP id p65so91305080wmp.1
\r
24 for <notmuch@notmuchmail.org>; Mon, 14 Mar 2016 01:35:53 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=dme-org.20150623.gappssmtp.com; s=20150623;
\r
27 h=to:cc:subject:in-reply-to:references:from:date:message-id
\r
28 :mime-version; bh=rhpalH7RARxSbuRDRF4WAS+Qj2Q0WyCRevokxxs+hGo=;
\r
29 b=HaoWx/RTpaCat6VD76oplH/KKrToCPi2DMO+tSNpPRt2yJ6sAAMf/KF86dHnY4aL4a
\r
30 nG/F2rXp1aahF+mgkyz2n9BngW6JNXlJ6MKMhP9jOiGEZ1jEHpi4/xyBOzvOSMwh5c0O
\r
31 l1EPpRa6Q3Hk9B7GoeJbYQFV1fnUEWtV3V7fQYN6rkaSWn5sDhmVOS3omoqj1hBjvKn8
\r
32 t12rBOyYo7GAcheXlw60zpYzCn4nrxU4KkfNm2pndtznVAn+CwO6GTlMGAPeCjrrXZsS
\r
33 Rm8Acef19tSaRmPcvL9X3HLk5dLp1453iLSj1jTBdiCl2sVJJvjTtwqge6voR/+f2XGi
\r
35 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
36 d=1e100.net; s=20130820;
\r
37 h=x-gm-message-state:to:cc:subject:in-reply-to:references:from:date
\r
38 :message-id:mime-version;
\r
39 bh=rhpalH7RARxSbuRDRF4WAS+Qj2Q0WyCRevokxxs+hGo=;
\r
40 b=Mp4wJ+SUw0qbVD17yoXk4BcdBtcGSpJHymCqkqMWeubgAwC/hNP5slwELiso0zFi+s
\r
41 WG/4TSAKoSGayJn+617219GGa/wTHfrnTx9IB0AowQPWdkE1ZJQzXEjnQI0wCuSSbffZ
\r
42 JCEZswcZ1EM+f5dyb6KFicbqHAxpZxS6Bs291sa29T8U29oZmZ81djWrFpizKT0nvdDI
\r
43 uxxJRGzi9ot6HArBINhGaA7XCigoY3Y/+F5Q37Yr2C/n3carMDPtPpbR5if85lY70QmQ
\r
44 xI6U/dLJRzl5+4d9GtXRQAkOukA2If4Y3zszrJkVVWOt5k4LmTPh0MEby/+dpmE87ClQ
\r
47 AD7BkJIKOb5VgjpgnE4m5Or+oi658MyiJdHytXNDu6FvZxY3qIysfQL60P+6q+ryRsdaVA==
\r
48 X-Received: by 10.28.60.84 with SMTP id j81mr16508989wma.91.1457944552130;
\r
49 Mon, 14 Mar 2016 01:35:52 -0700 (PDT)
\r
50 Received: from disaster-area.hh.sledj.net
\r
51 ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])
\r
52 by smtp.gmail.com with ESMTPSA id ys9sm21024027wjc.35.2016.03.14.01.35.50
\r
53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
54 Mon, 14 Mar 2016 01:35:51 -0700 (PDT)
\r
55 Received: from localhost (disaster-area.hh.sledj.net [local])
\r
56 by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 596438cd;
\r
57 Mon, 14 Mar 2016 08:35:50 +0000 (UTC)
\r
58 To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
\r
59 Subject: Re: [PATCH] emacs: hello: promote '?' as the universal help key
\r
60 In-Reply-To: <1457872037-22561-1-git-send-email-jani@nikula.org>
\r
61 References: <1457872037-22561-1-git-send-email-jani@nikula.org>
\r
62 From: David Edmondson <dme@dme.org>
\r
63 Date: Mon, 14 Mar 2016 08:35:50 +0000
\r
64 Message-ID: <m2k2l5qwwp.fsf@dme.org>
\r
66 Content-Type: text/plain
\r
67 X-BeenThere: notmuch@notmuchmail.org
\r
68 X-Mailman-Version: 2.1.20
\r
70 List-Id: "Use and development of the notmuch mail system."
\r
71 <notmuch.notmuchmail.org>
\r
72 List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
78 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
79 X-List-Received-Date: Mon, 14 Mar 2016 08:35:56 -0000
\r
81 Looks good, thanks for doing it.
\r
83 On Sun, Mar 13 2016, Jani Nikula wrote:
\r
84 > Move the brief help text at the bottom of the hello screen to the
\r
85 > notmuch-hello-mode help, and promote '?' as the universal help key
\r
86 > across Notmuch. This unclutters the hello screen, and allows for a
\r
87 > more verbose description in the mode help. Hopefully, this change is
\r
88 > useful for both experienced and new users alike.
\r
90 > While at it, improve the links to Notmuch and hello screen
\r
96 > id:1450026221-23286-1-git-send-email-jani@nikula.org
\r
98 > emacs/notmuch-hello.el | 44 +++++++++++++++++-----
\r
99 > test/emacs.expected-output/notmuch-hello | 7 +---
\r
100 > .../emacs.expected-output/notmuch-hello-long-names | 7 +---
\r
101 > .../notmuch-hello-no-saved-searches | 7 +---
\r
102 > .../emacs.expected-output/notmuch-hello-with-empty | 7 +---
\r
103 > 5 files changed, 42 insertions(+), 30 deletions(-)
\r
105 > diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
106 > index b42e0f24148a..8a31f9a1c52c 100644
\r
107 > --- a/emacs/notmuch-hello.el
\r
108 > +++ b/emacs/notmuch-hello.el
\r
109 > @@ -672,6 +672,31 @@ with `notmuch-hello-query-counts'."
\r
110 > (defun notmuch-hello-mode ()
\r
111 > "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.
\r
113 > +Saved searches are \"bookmarks\" for arbitrary queries. Hit RET
\r
114 > +or click on a saved search to view matching threads. Edit saved
\r
115 > +searches with the `edit' button. Type `\\[notmuch-jump-search]'
\r
116 > +in any Notmuch screen for quick access to saved searches that
\r
117 > +have shortcut keys.
\r
119 > +Type new searches in the search box and hit RET to view matching
\r
120 > +threads. Hit RET in a recent search box to re-submit a previous
\r
121 > +search. Edit it first if you like. Save a recent search to saved
\r
122 > +searches with the `save' button.
\r
124 > +Hit `\\[notmuch-search]' or `\\[notmuch-tree]' in any Notmuch
\r
125 > +screen to search for messages and view matching threads or
\r
126 > +messages, respectively. Recent searches are available in the
\r
127 > +minibuffer history.
\r
129 > +Expand the all tags view with the `show' button (and collapse
\r
130 > +again with the `hide' button). Hit RET or click on a tag name to
\r
131 > +view matching threads.
\r
133 > +Hit `\\[notmuch-refresh-this-buffer]' to refresh the screen and
\r
134 > +`\\[notmuch-bury-or-kill-this-buffer]' to quit.
\r
136 > +The screen may be customized via `\\[customize]'.
\r
138 > Complete list of currently available key bindings:
\r
140 > \\{notmuch-hello-mode-map}"
\r
141 > @@ -907,20 +932,19 @@ following:
\r
142 > (defun notmuch-hello-insert-footer ()
\r
143 > "Insert the notmuch-hello footer."
\r
144 > (let ((start (point)))
\r
145 > - (widget-insert "Type a search query and hit RET to view matching threads.\n")
\r
146 > - (when notmuch-search-history
\r
147 > - (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n")
\r
148 > - (widget-insert "Save recent searches with the `save' button.\n"))
\r
149 > - (when notmuch-saved-searches
\r
150 > - (widget-insert "Edit saved searches with the `edit' button.\n"))
\r
151 > - (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n")
\r
152 > - (widget-insert "`=' to refresh this screen. `s' to search messages. `q' to quit.\n")
\r
153 > + (widget-insert "Hit `?' for context-sensitive help in any Notmuch screen.\n")
\r
154 > + (widget-insert "Customize ")
\r
155 > + (widget-create 'link
\r
156 > + :notify (lambda (&rest ignore)
\r
157 > + (customize-group 'notmuch))
\r
158 > + :button-prefix "" :button-suffix ""
\r
160 > + (widget-insert " or ")
\r
161 > (widget-create 'link
\r
162 > :notify (lambda (&rest ignore)
\r
163 > (customize-variable 'notmuch-hello-sections))
\r
164 > :button-prefix "" :button-suffix ""
\r
166 > - (widget-insert " this page.")
\r
168 > (let ((fill-column (- (window-width) notmuch-hello-indent)))
\r
169 > (center-region start (point)))))
\r
171 > diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello
\r
172 > index 9ba4cfc1d560..89186082f8a9 100644
\r
173 > --- a/test/emacs.expected-output/notmuch-hello
\r
174 > +++ b/test/emacs.expected-output/notmuch-hello
\r
175 > @@ -8,8 +8,5 @@ Search: .
\r
179 > - Type a search query and hit RET to view matching threads.
\r
180 > - Edit saved searches with the `edit' button.
\r
181 > - Hit RET or click on a saved search or tag name to view matching threads.
\r
182 > - `=' to refresh this screen. `s' to search messages. `q' to quit.
\r
183 > - Customize this page.
\r
184 > + Hit `?' for context-sensitive help in any Notmuch screen.
\r
185 > + Customize Notmuch or this page.
\r
186 > diff --git a/test/emacs.expected-output/notmuch-hello-long-names b/test/emacs.expected-output/notmuch-hello-long-names
\r
187 > index 1c8d6eb624b9..da0f3525325d 100644
\r
188 > --- a/test/emacs.expected-output/notmuch-hello-long-names
\r
189 > +++ b/test/emacs.expected-output/notmuch-hello-long-names
\r
190 > @@ -11,8 +11,5 @@ All tags: [hide]
\r
191 > 52 a-very-long-tag 52 inbox 52 unread
\r
192 > 4 attachment 7 signed
\r
194 > - Type a search query and hit RET to view matching threads.
\r
195 > - Edit saved searches with the `edit' button.
\r
196 > - Hit RET or click on a saved search or tag name to view matching threads.
\r
197 > - `=' to refresh this screen. `s' to search messages. `q' to quit.
\r
198 > - Customize this page.
\r
199 > + Hit `?' for context-sensitive help in any Notmuch screen.
\r
200 > + Customize Notmuch or this page.
\r
201 > diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches
\r
202 > index 05475b15abee..939965fef154 100644
\r
203 > --- a/test/emacs.expected-output/notmuch-hello-no-saved-searches
\r
204 > +++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches
\r
205 > @@ -4,8 +4,5 @@ Search: .
\r
209 > - Type a search query and hit RET to view matching threads.
\r
210 > - Edit saved searches with the `edit' button.
\r
211 > - Hit RET or click on a saved search or tag name to view matching threads.
\r
212 > - `=' to refresh this screen. `s' to search messages. `q' to quit.
\r
213 > - Customize this page.
\r
214 > + Hit `?' for context-sensitive help in any Notmuch screen.
\r
215 > + Customize Notmuch or this page.
\r
216 > diff --git a/test/emacs.expected-output/notmuch-hello-with-empty b/test/emacs.expected-output/notmuch-hello-with-empty
\r
217 > index 854e0c2a22e8..97d7db26ebfa 100644
\r
218 > --- a/test/emacs.expected-output/notmuch-hello-with-empty
\r
219 > +++ b/test/emacs.expected-output/notmuch-hello-with-empty
\r
220 > @@ -8,8 +8,5 @@ Search: .
\r
224 > - Type a search query and hit RET to view matching threads.
\r
225 > - Edit saved searches with the `edit' button.
\r
226 > - Hit RET or click on a saved search or tag name to view matching threads.
\r
227 > - `=' to refresh this screen. `s' to search messages. `q' to quit.
\r
228 > - Customize this page.
\r
229 > + Hit `?' for context-sensitive help in any Notmuch screen.
\r
230 > + Customize Notmuch or this page.
\r