From 6d1863a20bc4c71c38694ba83227b5145f8e2882 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Fri, 21 Aug 2015 23:22:20 -0400
Subject: Remove km/avy-goto-subword-1

This is fixed upstream as of a6cfeda ("avy.el (avy-goto-subword-0):
Don't offer invisible chars", 2015-08-21).
---
 lisp/init-ace.el  | 11 +----------
 lisp/init-mail.el |  2 +-
 lisp/init-org.el  |  2 +-
 lisp/init-view.el |  2 +-
 4 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'lisp')

diff --git a/lisp/init-ace.el b/lisp/init-ace.el
index cc6eee3..3417013 100644
--- a/lisp/init-ace.el
+++ b/lisp/init-ace.el
@@ -2,16 +2,7 @@
 
 (require 'avy)
 
-(defun km/avy-goto-subword-1 (char arg)
-  "Like `avy-goto-subword-1', but don't consider invisible text."
-  (interactive (list (read-char "char: ") current-prefix-arg))
-  (avy--with-avy-keys avy-goto-subword-1
-    (let ((char (downcase char)))
-      (avy-goto-subword-0
-       arg (lambda () (and (not (invisible-p (point)))
-                           (eq (downcase (char-after)) char)))))))
-
-(key-chord-define-global "jf" 'km/avy-goto-subword-1)
+(key-chord-define-global "jf" 'avy-goto-subword-1)
 
 ;;; Ace Link
 
diff --git a/lisp/init-mail.el b/lisp/init-mail.el
index dd99c5b..cf96b83 100644
--- a/lisp/init-mail.el
+++ b/lisp/init-mail.el
@@ -96,7 +96,7 @@ is off."
 
 (defun km/gnus-avy-goto-subword-and-select ()
   (interactive)
-  (call-interactively #'km/avy-goto-subword-1)
+  (call-interactively #'avy-goto-subword-1)
   (gnus-summary-scroll-up 0))
 
 (defun km/gnus-follow-last-message-link (copy)
diff --git a/lisp/init-org.el b/lisp/init-org.el
index b746733..37c49a0 100644
--- a/lisp/init-org.el
+++ b/lisp/init-org.el
@@ -483,7 +483,7 @@ displayed in the agenda."
 
 (defun km/org-agenda-avy-goto-subword-1 ()
   (interactive)
-  (call-interactively #'km/avy-goto-subword-1)
+  (call-interactively #'avy-goto-subword-1)
   (org-agenda-do-context-action))
 
 (define-key km/global-org-map "a" 'org-agenda)
diff --git a/lisp/init-view.el b/lisp/init-view.el
index e80160f..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" 'km/avy-goto-subword-1))
+  (define-key view-mode-map "j" 'avy-goto-subword-1))
 
 (key-chord-define-global "hq" 'view-mode)
 
-- 
cgit v1.2.3