From a664d8fe3e8e8bb8ef6bbda65c9a306886eaa77d Mon Sep 17 00:00:00 2001
From: James Nguyen <james@jojojames.com>
Date: Sat, 13 Jan 2018 11:11:20 -0800
Subject: [PATCH] Integration: Move etags-select

---
 evil-collection-etags-select.el | 38 +++++++++++++++++++++++++++++++++
 evil-collection-integration.el  |  6 ------
 evil-collection.el              |  1 +
 3 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 evil-collection-etags-select.el

diff --git a/evil-collection-etags-select.el b/evil-collection-etags-select.el
new file mode 100644
index 0000000..d5450c5
--- /dev/null
+++ b/evil-collection-etags-select.el
@@ -0,0 +1,38 @@
+;;; evil-collection-etags-select.el --- Bindings for `etags-select'. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2017 James Nguyen
+
+;; Author: James Nguyen <james@jojojames.com>
+;; Maintainer: James Nguyen <james@jojojames.com>
+;; Pierre Neidhardt <ambrevar@gmail.com>
+;; URL: https://github.com/jojojames/evil-collection
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "25.1"))
+;; Keywords: evil, emacs, tools
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;; Bindings for `etags-select'.
+(require 'evil)
+(require 'etags-select nil t)
+
+;;; Code:
+(defun evil-collection-etags-select-setup ()
+  "Set up `evil' bindings for `etags-select'.."
+  ;; FIXME: probably etags-select should be recomended in docs
+  (define-key evil-motion-state-map "g]" 'etags-select-find-tag-at-point))
+
+(provide 'evil-collection-etags-select)
+;;; evil-collection-etags-select.el ends here
diff --git a/evil-collection-integration.el b/evil-collection-integration.el
index 355ab5a..947d523 100644
--- a/evil-collection-integration.el
+++ b/evil-collection-integration.el
@@ -98,12 +98,6 @@
   (when (fboundp 'evil-repeat-abort)
     (evil-repeat-abort)))
 
-;; etags-select
-;; FIXME: probably etags-select should be recomended in docs
-(eval-after-load 'etags-select
-  '(progn
-     (define-key evil-motion-state-map "g]" 'etags-select-find-tag-at-point)))
-
 ;;; Buffer-menu
 
 (evil-add-hjkl-bindings Buffer-menu-mode-map 'motion)
diff --git a/evil-collection.el b/evil-collection.el
index d258912..05a211e 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -81,6 +81,7 @@ or evil-collection.")
     emms
     eshell
     eval-sexp-fu
+    etags-select
     eww
     flycheck
     geiser