From 01d31a2f4d73263dcab1478c1a35e756e1e3fbd4 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 20 May 2015 12:09:07 +0200
Subject: Emacs: Replace ace-jump-mode with avy

---
 tag-emacs/emacs.d/Cask    |  2 +-
 tag-emacs/emacs.d/init.el | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tag-emacs/emacs.d/Cask b/tag-emacs/emacs.d/Cask
index eb15bd94..580361d9 100644
--- a/tag-emacs/emacs.d/Cask
+++ b/tag-emacs/emacs.d/Cask
@@ -4,7 +4,7 @@
 (source melpa-stable)
 (source org)
 
-(depends-on "ace-jump-mode")
+(depends-on "avy")
 (depends-on "ag")
 (depends-on "async")
 (depends-on "auto-compile")
diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index 03e2abcd..55efdbe8 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -1160,13 +1160,13 @@ symbol, not word, as I need this for programming the most."
   :config (progn
             (add-hook 'markdown-mode-hook #'turn-on-auto-fill)))
 
-(req-package ace-jump-mode
-  :bind (("C-c SPC" . ace-jump-mode)
-         ("C-|" . ace-jump-line-mode))
+(req-package avy
+  :bind (("M-g g" . avy-goto-line)
+		 ("M-g M-g" . avy-goto-line)
+		 ("C-c SPC" . avy-goto-char))
   :config (progn
-            (ace-jump-mode-enable-mark-sync)
-            (setq ace-jump-word-mode-use-query-char nil
-                  ace-jump-mode-scope 'window)))
+			(avy-setup-default)
+			(setq avy-all-windows nil)))
 
 (req-package expand-region
   :bind ("C-M-SPC" . er/expand-region))
-- 
cgit 1.4.1