X-Git-Url: https://code.delx.au/dotemacs/blobdiff_plain/32bba2b1c9e919740871e84fad981f24eb1c9cdf..40c58d718112bdd16c1f673030c78554bfcdb451:/README.md

diff --git a/README.md b/README.md
index 32e08ed..d4a32ce 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,8 @@ C-h v                                           Describe variable
 C-h f                                           Describe function
 C-h m                                           Documentation on active modes
 <prefix> C-h                                    Show bindings starting with <prefix>
+C-c C-b                                         Back to previous help topic (while in help-mode)
+q                                               Quit window and bury buffer
 ```
 
 # Search
@@ -33,10 +35,11 @@ C-h m                                           Documentation on active modes
 C-s                                             Search forward (ivy/swiper mode)
 C-r                                             Resume ivy search
 C-7                                             Start a cursor for each result (while searching)
+C-'                                             Switch to avy jump mode
 M-q                                             Replace searched item (while searching)
 M-p                                             Search for previous item (while searching)
 M-n                                             Search for symbol at point (while searching)
-M-%                                             Search and replace
+C-c C-o                                         Dump all results into a buffer (ivy-occur)
 ```
 
 # Files/buffers
@@ -143,6 +146,15 @@ C-c m                                           Ask to insert extra cursor at lo
 M-=                                             Display info about region
 ```
 
+# Highlighting
+```
+M-s h u                                         Unhighlight regexp
+M-s h .                                         Highlight symbol at point
+M-s h p                                         Highlight phrase
+M-s h r                                         Highlight regexp
+M-s h l                                         Highlight lines matching regexp
+```
+
 # Killing and deleting
 ```
 C-M-k                                           Kill s-expression / symbol
@@ -188,9 +200,12 @@ F4                                              Play back macro
 # Mode switching
 ```
 C-x C-j                                         Open direx at current file
+C-c g s                                         Magit status
 F8                                              Toggle flyspell-mode
 F9                                              Toggle whitespace mode
 F10                                             Toggle word wrap
+M-s o                                           Search in buffer and display results in occur-mode
+M-x multi-occur                                 Search in buffers and display results in occur-mode
 M-x eshell                                      Run eshell
 M-x ielm                                        Run Emacs Lisp REPL
 M-x linum-mode                                  Display line numbers
@@ -203,6 +218,34 @@ M-x term                                        Run terminal
 M-x yas-reload-all                              Reload all snippets
 ```
 
+# Occur
+```
+g                                               Reload
+e                                               Switch to edit mode
+C-c C-c                                         Switch back to occur mode
+M-g M-p                                         Previous occurence
+M-g M-n                                         Next occurence
+```
+
+# Magit / Git gutter
+```
+C-c g d                                         Popup diff
+C-c g p                                         Previous hunk
+C-c g f                                         Next hunk
+C-c g s                                         Magit status
+C-c g g                                         Magit dispatch popup
+p                                               Previous section
+n                                               Next section
+M-p                                             Previous sibling section
+M-n                                             Next sibling section
+^                                               Up section
+Tab                                             Toggle visibility of section
+C-Tab                                           Cycle visibility of section and its children
+q                                               Kill window and bury buffer
+C-c C-c                                         Perform action
+C-c C-k                                         Cancel action
+```
+
 # Lisp
 ```
 C-M-x                                           Eval top-level form