Merge branch 'release'

[notmuch] / doc / notmuch-emacs.rst

diff --git a/doc/notmuch-emacs.rst b/doc/notmuch-emacs.rst
index 82bb35a0a5d7d76f38a870889167ab3bfae4730c..0df46df9e700fd1bd5bc046697b1247d8bfa9646 100644 (file)
--- a/doc/notmuch-emacs.rst
+++ b/doc/notmuch-emacs.rst
@@ -62,6 +62,7 @@ notmuch-hello key bindings
 ``<return>``
     Activate the current widget.
 
+``g``
 ``=``
     Refresh the buffer; mainly update the counts of messages for various
     saved searches.
@@ -159,6 +160,10 @@ menu of results that the user can explore further by pressing
 ``<return>``
     Open thread on current line in :ref:`notmuch-show` mode
 
+``g``
+``=``
+    Refresh the buffer
+
 ``?``
     Display full set of key bindings
 
@@ -211,6 +216,14 @@ pressing RET after positioning the cursor on a hidden part.
 ``?``
     Display full set of key bindings
 
+Display of messages can be controlled by the following variables
+
+:index:`notmuch-message-headers`
+       |docstring::notmuch-message-headers|
+
+:index:`notmuch-message-headers-visible`
+       |docstring::notmuch-message-headers-visible|
+
 .. _show-copy:
 
 Copy to kill-ring
@@ -288,6 +301,10 @@ tags.
 ``p``
     Move to previous matching message
 
+``g``
+``=``
+    Refresh the buffer
+
 ``?``
     Display full set of key bindings
 
@@ -330,7 +347,13 @@ operations specified in ``notmuch-tagging-keys``; i.e. each
 
 :index:`notmuch-tagging-keys`
 
-   A list of keys and corresponding tagging operations.
+  |docstring::notmuch-tagging-keys|
+
+Buffer navigation
+=================
+
+:index:`notmuch-cycle-notmuch-buffers`
+   |docstring::notmuch-cycle-notmuch-buffers|
 
 Configuration
 =============
@@ -341,8 +364,10 @@ Importing Mail
 --------------
 
 :index:`notmuch-poll`
+   |docstring::notmuch-poll|
 
 :index:`notmuch-poll-script`
+   |docstring::notmuch-poll-script|
 
 Init File
 ---------
@@ -358,5 +383,10 @@ options, ``notmuch-init-file`` is not read.
 
 .. include:: ../emacs/rstdoc.rsti
 
+.. include:: ../emacs/notmuch.rsti
+
+.. include:: ../emacs/notmuch-lib.rsti
 
 .. include:: ../emacs/notmuch-show.rsti
+
+.. include:: ../emacs/notmuch-tag.rsti