From: James Bunton <jamesbunton@delx.net.au>
Date: Sun, 24 Jul 2016 10:59:36 +0000 (+1000)
Subject: use avy instead of ace-jump
X-Git-Url: https://code.delx.au/dotemacs/commitdiff_plain/3571b70ee30546f784dafe955a31efcffece7a45

use avy instead of ace-jump
---

diff --git a/.gitmodules b/.gitmodules
index c71de2b..7602c46 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,9 +34,6 @@
 [submodule "indent-guide"]
 	path = packages/indent-guide
 	url = https://github.com/zk-phi/indent-guide.git
-[submodule "ace-jump-mode"]
-	path = packages/ace-jump-mode
-	url = https://github.com/winterTTr/ace-jump-mode.git
 [submodule "expand-region"]
 	path = packages/expand-region
 	url = https://github.com/magnars/expand-region.el.git
@@ -97,3 +94,6 @@
 [submodule "popwin"]
 	path = packages/popwin
 	url = https://github.com/m2ym/popwin-el.git
+[submodule "avy"]
+	path = packages/avy
+	url = https://github.com/abo-abo/avy.git
diff --git a/README.md b/README.md
index bac8463..a44cf99 100644
--- a/README.md
+++ b/README.md
@@ -31,11 +31,11 @@ C-h m                                           Documentation on active modes
 ```
 C-s                                             Search forward (ivy/swiper mode)
 C-r                                             Resume ivy search
-M-s .                                           Search for symbol around point
-C-s                                             Find next item (while searching)
-Backspace                                       Previous search (while searching)
+C-7                                             Start a cursor for each result (while searching)
+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
-M-x linum-mode                                  Display line numbers
 ```
 
 # Files/buffers
@@ -74,9 +74,10 @@ M-x make-frame                                  New frame (X11 window)
 ```
 M-m                                             Jump back to start of indentation
 M-r                                             Jump to window top/bottom/middle
-M-g M-g                                         Jump to line
 M-g Tab                                         Jump to column
-M-g j                                           Jump to character
+M-g M-j                                         Jump to charactor
+M-g M-w                                         Jump to word by first character
+M-g M-g                                         Jump to visible line or any line
 C-a                                             Beginning of line
 C-e                                             End of line
 C-p                                             Back one line
@@ -112,11 +113,12 @@ M-c                                             Capitalise word
 C-x C-l                                         Lower case region
 C-x C-u                                         Upper case region
 C-o                                             Insert a new line above point
-M-o						Insert a new line below point
+M-o                                             Insert a new line below point
 C-j                                             Newline and maybe indent
 M-^                                             Join to previous line
-M-j						New line with comment
-C-q						Quoted insert
+M-j                                             New line with comment
+C-q                                             Quoted insert
+M-x comment-box                                 Wrap region in comment box
 ```
 
 # Marking
@@ -183,6 +185,7 @@ F9                                              Toggle whitespace mode
 F10                                             Toggle word wrap
 M-x eshell                                      Run eshell
 M-x ielm                                        Run Emacs Lisp REPL
+M-x linum-mode                                  Display line numbers
 M-x shell                                       Run bash shell
 M-x slime                                       Run Common Lisp REPL
 M-x smerge-ediff                                Resolve merge conflicts in multi-window mode
diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 0c65c9a..601a7d8 100644
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -23,7 +23,9 @@
 (global-set-key (kbd "<C-right>") 'windmove-right)
 
 ;; Movement
-(global-set-key (kbd "M-g j") 'ace-jump-mode)
+(global-set-key (kbd "M-g M-j") 'avy-goto-char-timer)
+(global-set-key (kbd "M-g M-w") 'avy-goto-word-1)
+(global-set-key (kbd "M-g M-g") 'avy-goto-line)
 
 ;; Text formatting
 (global-set-key (kbd "M-/") 'hippie-expand)
diff --git a/lisp/my-minor-modes.el b/lisp/my-minor-modes.el
index 41491df..a38657f 100644
--- a/lisp/my-minor-modes.el
+++ b/lisp/my-minor-modes.el
@@ -1,4 +1,7 @@
-(require 'ace-jump-mode)
+(require 'avy)
+(setq avy-background t)
+(setq avy-all-windows nil)
+(setq avy-timeout-seconds 1)
 
 (require 'change-inner)
 
diff --git a/packages/ace-jump-mode b/packages/ace-jump-mode
deleted file mode 160000
index 8351e2d..0000000
--- a/packages/ace-jump-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8351e2df4fbbeb2a4003f2fb39f46d33803f3dac
diff --git a/packages/avy b/packages/avy
new file mode 160000
index 0000000..a5fb936
--- /dev/null
+++ b/packages/avy
@@ -0,0 +1 @@
+Subproject commit a5fb9369e7b68c9786f2d620f064b4b93f2ae902