debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-27 21:27:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: hello: promote '?' as the universal help key

Browse source 
Move the brief help text at the bottom of the hello screen to the
notmuch-hello-mode help, and promote '?' as the universal help key
across Notmuch. This unclutters the hello screen, and allows for a
more verbose description in the mode help. Hopefully, this change is
useful for both experienced and new users alike.

While at it, improve the links to Notmuch and hello screen
customization.
This commit is contained in:
Jani Nikula 2016-03-13 14:27:17 +02:00 committed by David Bremner
parent bd68a862ae
commit b8a136187a
5 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
emacs/notmuch-hello.el
View file

@ -672,6 +672,31 @@ with `notmuch-hello-query-counts'."
(defun notmuch-hello-mode () (defun notmuch-hello-mode ()
"Major mode for convenient notmuch navigation. This is your entry portal into notmuch. "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.
Saved searches are \"bookmarks\" for arbitrary queries. Hit RET
or click on a saved search to view matching threads. Edit saved
searches with the `edit' button. Type `\\[notmuch-jump-search]'
in any Notmuch screen for quick access to saved searches that
have shortcut keys.
Type new searches in the search box and hit RET to view matching
threads. Hit RET in a recent search box to re-submit a previous
search. Edit it first if you like. Save a recent search to saved
searches with the `save' button.
Hit `\\[notmuch-search]' or `\\[notmuch-tree]' in any Notmuch
screen to search for messages and view matching threads or
messages, respectively. Recent searches are available in the
minibuffer history.
Expand the all tags view with the `show' button (and collapse
again with the `hide' button). Hit RET or click on a tag name to
view matching threads.
Hit `\\[notmuch-refresh-this-buffer]' to refresh the screen and
`\\[notmuch-bury-or-kill-this-buffer]' to quit.
The screen may be customized via `\\[customize]'.
Complete list of currently available key bindings: Complete list of currently available key bindings:
\\{notmuch-hello-mode-map}" \\{notmuch-hello-mode-map}"
@ -907,20 +932,19 @@ following:
(defun notmuch-hello-insert-footer () (defun notmuch-hello-insert-footer ()
"Insert the notmuch-hello footer." "Insert the notmuch-hello footer."
(let ((start (point))) (let ((start (point)))
(widget-insert "Type a search query and hit RET to view matching threads.\n") (widget-insert "Hit `?' for context-sensitive help in any Notmuch screen.\n")
(when notmuch-search-history (widget-insert "Customize ")
(widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n") (widget-create 'link
(widget-insert "Save recent searches with the `save' button.\n")) :notify (lambda (&rest ignore)
(when notmuch-saved-searches (customize-group 'notmuch))
(widget-insert "Edit saved searches with the `edit' button.\n")) :button-prefix "" :button-suffix ""
(widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n") "Notmuch")
(widget-insert "`=' to refresh this screen. `s' to search messages. `q' to quit.\n") (widget-insert " or ")
(widget-create 'link (widget-create 'link
:notify (lambda (&rest ignore) :notify (lambda (&rest ignore)
(customize-variable 'notmuch-hello-sections)) (customize-variable 'notmuch-hello-sections))
:button-prefix "" :button-suffix "" :button-prefix "" :button-suffix ""
"Customize") "this page.")
(widget-insert " this page.")
(let ((fill-column (- (window-width) notmuch-hello-indent))) (let ((fill-column (- (window-width) notmuch-hello-indent)))
(center-region start (point))))) (center-region start (point)))))

7
test/emacs.expected-output/notmuch-hello
View file

@ -8,8 +8,5 @@ Search: .
All tags: [show] All tags: [show]
Type a search query and hit RET to view matching threads. Hit `?' for context-sensitive help in any Notmuch screen.
Edit saved searches with the `edit' button. Customize Notmuch or this page.
Hit RET or click on a saved search or tag name to view matching threads.
`=' to refresh this screen. `s' to search messages. `q' to quit.
Customize this page.

7
test/emacs.expected-output/notmuch-hello-long-names
View file

@ -11,8 +11,5 @@ All tags: [hide]
52 a-very-long-tag 52 inbox 52 unread 52 a-very-long-tag 52 inbox 52 unread
4 attachment 7 signed 4 attachment 7 signed
Type a search query and hit RET to view matching threads. Hit `?' for context-sensitive help in any Notmuch screen.
Edit saved searches with the `edit' button. Customize Notmuch or this page.
Hit RET or click on a saved search or tag name to view matching threads.
`=' to refresh this screen. `s' to search messages. `q' to quit.
Customize this page.

7
test/emacs.expected-output/notmuch-hello-no-saved-searches
View file

@ -4,8 +4,5 @@ Search: .
All tags: [show] All tags: [show]
Type a search query and hit RET to view matching threads. Hit `?' for context-sensitive help in any Notmuch screen.
Edit saved searches with the `edit' button. Customize Notmuch or this page.
Hit RET or click on a saved search or tag name to view matching threads.
`=' to refresh this screen. `s' to search messages. `q' to quit.
Customize this page.

7
test/emacs.expected-output/notmuch-hello-with-empty
View file

@ -8,8 +8,5 @@ Search: .
All tags: [show] All tags: [show]
Type a search query and hit RET to view matching threads. Hit `?' for context-sensitive help in any Notmuch screen.
Edit saved searches with the `edit' button. Customize Notmuch or this page.
Hit RET or click on a saved search or tag name to view matching threads.
`=' to refresh this screen. `s' to search messages. `q' to quit.
Customize this page.