5 files changed, 13 insertions, 18 deletions
diff --git a/lisp/init-ace.el b/lisp/init-ace.el
index db1a514..e971121 100644
--- a/lisp/init-ace.el
+++ b/lisp/init-ace.el
@@ -1,10 +1,6 @@
-;;; Ace Jump
+;;; Avy
 
-(setq ace-jump-mode-scope 'frame)
-
-(key-chord-define-global "jf" 'ace-jump-mode)
-
-(setq ace-jump-mode-move-keys (loop for i from ?a to ?z collect i))
+(key-chord-define-global "jf" 'avy-goto-subword-1)
 
 ;;; Ace Link
 
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 7387816..b8e4244 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -281,9 +281,9 @@ the file name if NO-DIRECTORY is non-nil."
   (define-key magit-file-section-map (kbd "C-j") 'magit-diff-visit-file-worktree)
   (define-key magit-hunk-section-map (kbd "C-j") 'magit-diff-visit-file-worktree)
 
-  (define-key magit-log-mode-map "j" 'ace-jump-mode)
-  (define-key magit-refs-mode-map "j" 'ace-jump-mode)
-  (define-key magit-cherry-mode-map "j" 'ace-jump-mode)
+  (define-key magit-log-mode-map "j" 'avy-goto-subword-1)
+  (define-key magit-refs-mode-map "j" 'avy-goto-subword-1)
+  (define-key magit-cherry-mode-map "j" 'avy-goto-subword-1)
 
   (define-key km/git-map "c" 'km/magit-show-commit-under-point)
   (define-key km/git-map "C" 'km/magit-show-project-commit-under-point)
diff --git a/lisp/init-gnus.el b/lisp/init-gnus.el
index e556b53..6abfd04 100644
--- a/lisp/init-gnus.el
+++ b/lisp/init-gnus.el
@@ -94,11 +94,10 @@ is off."
 (setq gnus-thread-hide-subtree t
       gnus-thread-sort-functions '(gnus-thread-sort-by-most-recent-number))
 
-(add-hook 'gnus-summary-mode-hook 'km/gnus-setup-local-ace-jump)
-
-(defun km/gnus-setup-local-ace-jump ()
-  (add-hook 'ace-jump-mode-end-hook (lambda () (gnus-summary-scroll-up 0))
-            nil t))
+(defun km/gnus-avy-goto-subword-and-select ()
+  (interactive)
+  (call-interactively #'avy-goto-subword-1)
+  (gnus-summary-scroll-up 0))
 
 (defun km/gnus-follow-last-message-link (copy)
   "Follow shr link at bottom of message.
@@ -173,7 +172,7 @@ to group buffer instead of moving to next group."
 ;; 'S p'.
 (define-key gnus-summary-mode-map "c" 'km/gnus-summary-catchup)
 (define-key gnus-summary-mode-map "e" 'gnus-summary-scroll-up)
-(define-key gnus-summary-mode-map "j" 'ace-jump-mode)
+(define-key gnus-summary-mode-map "j" 'km/gnus-avy-goto-subword-and-select)
 
 (define-key gnus-article-mode-map
   (kbd "C-c l") 'km/gnus-follow-last-message-link)
diff --git a/lisp/init-org.el b/lisp/init-org.el
index 71f422f..a66b3eb 100644
--- a/lisp/init-org.el
+++ b/lisp/init-org.el
@@ -599,9 +599,9 @@ global value. A numeric prefix sets MAXLEVEL (defaults to 2)."
   (add-to-list 'org-speed-commands-user '("w" . km/org-refile-dwim)))
 
 (after 'org-agenda
-  ;; Free up 'j' for `ace-jump-mode'.
+  ;; Free up 'j' for `avy-goto-subword-1'.
   (define-key org-agenda-mode-map (kbd "C-j") 'org-agenda-goto-date)
-  (define-key org-agenda-mode-map "j" 'ace-jump-mode))
+  (define-key org-agenda-mode-map "j" 'avy-goto-subword-1))
 
 
 ;;; Links
diff --git a/lisp/init-view.el b/lisp/init-view.el
index fab08e9..9a4536c 100644
--- a/lisp/init-view.el
+++ b/lisp/init-view.el
@@ -6,7 +6,7 @@
   (define-key view-mode-map "b" 'backward-word)
   (define-key view-mode-map "]" 'forward-paragraph)
   (define-key view-mode-map "[" 'backward-paragraph)
-  (define-key view-mode-map "j" 'ace-jump-mode))
+  (define-key view-mode-map "j" 'avy-goto-subword-1))
 
 (key-chord-define-global "hq" 'view-mode)