From e2e38273babae53f30fea5ce9d3876fb0b17d95e Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 18 Mar 2015 03:16:25 -0400
Subject: [PATCH] Remove ace-jump

---
 core/core-evil.el   | 37 +------------------------------------
 init/my-bindings.el | 21 +--------------------
 2 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/core/core-evil.el b/core/core-evil.el
index cb3d73bb8..e4565e602 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -16,11 +16,7 @@
           evil-normal-state-cursor  '("white" box)
           evil-emacs-state-cursor   '("cyan" bar)
           evil-insert-state-cursor  '("white" bar)
-          evil-visual-state-cursor  'hollow
-
-          ace-jump-mode-scope     'window
-          ace-jump-mode-move-keys (nconc (loop for i from ?a to ?z collect i)
-                                         (loop for i from ?A to ?Z collect i)))
+          evil-visual-state-cursor  'hollow)
 
     (evil-mode)
     ;; Always ensure evil-shift-width is consistent with tab-width
@@ -116,37 +112,6 @@
         (defadvice evil-force-normal-state (before evil-esc-quit-popwin activate)
           (shut-up (popwin:close-popup-window))))
 
-      ;; Ace-Jump: Enable half-cursor blink when using ace-jump
-      (defadvice evil-ace-jump-char-mode (before evil-ace-jump-char-mode-op activate)
-        (evil-half-cursor))
-      (defadvice evil-ace-jump-word-mode (before evil-ace-jump-word-mode-op activate)
-        (evil-half-cursor))
-
-      ;; https://github.com/winterTTr/ace-jump-mode/issues/23
-      (evil-define-motion evil-ace-jump-two-chars-mode (count)
-        :type exclusive
-        :repeat abort
-        (evil-without-repeat
-          (evil-enclose-ace-jump-for-motion
-            (call-interactively 'ace-jump-two-chars-mode))))
-
-      (defun ace-jump-two-chars-mode (&optional query-char query-char-2)
-        "AceJump two chars mode"
-        (interactive)
-
-        (evil-half-cursor)
-        (setq query-char (or query-char (read-char ">")))
-        (setq query-char-2 (or query-char-2 (read-char (concat ">" (string query-char)))))
-
-        (if (eq (ace-jump-char-category query-char) 'other)
-            (error "[AceJump] Non-printable character"))
-
-        ;; others : digit , alpha, punc
-        (setq ace-jump-query-char query-char)
-        (setq ace-jump-current-mode 'ace-jump-char-mode)
-        (ace-jump-do (regexp-quote (concat (char-to-string query-char)
-                                           (char-to-string query-char-2)))))
-
       ;; Jump to new splits
       (defadvice evil-window-split (after evil-window-split-jump activate)
         (evil-window-down 1))
diff --git a/init/my-bindings.el b/init/my-bindings.el
index 228ebe569..163ce8b17 100644
--- a/init/my-bindings.el
+++ b/init/my-bindings.el
@@ -34,15 +34,7 @@
       ";"     'evil-ex
       "X"     'evil-exchange
 
-      "g SPC" (λ (call-interactively
-                  (if (evil-visual-line-state-p)
-                      'evil-ace-jump-line-mode
-                    'evil-ace-jump-char-mode)))
-      "g w"   'evil-ace-jump-word-mode  ; overwrites evil-fill
-      "g l"   'evil-ace-jump-line-mode
-      "g s"   'evil-ace-jump-two-chars-mode
-      "g t"   'ace-window
-      "g T"   (λ (ace-window 4))
+      "g l"   (λ (linum-mode 1) (evil-ex "") (linum-mode -1))
 
       "] e"   'next-error
       "[ e"   'previous-error
@@ -122,17 +114,6 @@
                 (evil-normal-state)
                 (evil-visual-restore)))
 
-
-(defun my--enable-linum ()
-  (interactive)
-  (linum-mode 1)
-  (add-hook 'pre-command-hook 'my--disable-linum))
-
-(defun my--disable-linum ()
-  (interactive)
-  (linum-mode 0)
-  (remove-hook 'pre-command-hook 'my--disable-linum))
-
 (bind 'emacs [escape] 'evil-normal-state)
 
 (bind 'insert my-mode-map