diff --git a/evil-collection-ag.el b/evil-collection-ag.el index 940dd08..33cf83c 100644 --- a/evil-collection-ag.el +++ b/evil-collection-ag.el @@ -29,7 +29,6 @@ ;;; Code: (require 'ag nil t) (require 'evil-collection) -(require 'evil-collection-evil-search) (defconst evil-collection-ag-maps '(ag-mode-map)) diff --git a/evil-collection-compile.el b/evil-collection-compile.el index 908837e..0e356b7 100644 --- a/evil-collection-compile.el +++ b/evil-collection-compile.el @@ -29,7 +29,6 @@ ;;; Code: (require 'evil-collection) (require 'compile) -(require 'evil-collection-evil-search) (defconst evil-collection-compile-maps '(compilation-mode-map)) diff --git a/evil-collection-evil-search.el b/evil-collection-evil-search.el deleted file mode 100644 index d448d9e..0000000 --- a/evil-collection-evil-search.el +++ /dev/null @@ -1,62 +0,0 @@ -;;; evil-collection-evil-search.el --- Utility for `evil-search'. -*- lexical-binding: t -*- - -;; Copyright (C) 2017 James Nguyen - -;; Author: James Nguyen -;; Maintainer: James Nguyen -;; Pierre Neidhardt -;; URL: https://github.com/emacs-evil/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 . - -;;; Commentary: -;;; Utility for `evil-search'. -;;; https://github.com/emacs-evil/evil-collection/issues/49 -;;; https://github.com/emacs-evil/evil-magit/issues/33 - -;;; Code: -(require 'evil-search) - -(defun evil-collection-evil-search-enabled () - (eq evil-search-module 'evil-search)) - -(defvar evil-collection-evil-search-forward - '(menu-item "" nil :filter (lambda (&optional _) - (if (eq evil-search-module 'evil-search) - #'evil-ex-search-forward - #'evil-search-forward)))) - -(defvar evil-collection-evil-search-backward - '(menu-item "" nil :filter (lambda (&optional _) - (if (eq evil-search-module 'evil-search) - #'evil-ex-search-backward - #'evil-search-backward)))) - -(defvar evil-collection-evil-search-next - '(menu-item "" nil :filter (lambda (&optional _) - (if (eq evil-search-module 'evil-search) - #'evil-ex-search-next - #'evil-search-next)))) - -(defvar evil-collection-evil-search-previous - '(menu-item "" nil :filter (lambda (&optional _) - (if (eq evil-search-module 'evil-search) - #'evil-ex-search-previous - #'evil-search-previous)))) - -(provide 'evil-collection-evil-search) -;;; evil-collection-evil-search.el ends here diff --git a/evil-collection-info.el b/evil-collection-info.el index bb303ac..f815f61 100644 --- a/evil-collection-info.el +++ b/evil-collection-info.el @@ -29,7 +29,6 @@ ;;; Code: (require 'evil-collection) -(require 'evil-collection-evil-search) (require 'info) (defconst evil-collection-info-maps '(Info-mode-map)) diff --git a/evil-collection.el b/evil-collection.el index 64d3ab2..9048edf 100644 --- a/evil-collection.el +++ b/evil-collection.el @@ -460,5 +460,34 @@ instead of the modes in `evil-collection-mode-list'." lispyville-yank) "List of yank operators.") +;;* Search + +(defun evil-collection-evil-search-enabled () + (eq evil-search-module 'evil-search)) + +(defvar evil-collection-evil-search-forward + '(menu-item "" nil :filter (lambda (&optional _) + (if (eq evil-search-module 'evil-search) + #'evil-ex-search-forward + #'evil-search-forward)))) + +(defvar evil-collection-evil-search-backward + '(menu-item "" nil :filter (lambda (&optional _) + (if (eq evil-search-module 'evil-search) + #'evil-ex-search-backward + #'evil-search-backward)))) + +(defvar evil-collection-evil-search-next + '(menu-item "" nil :filter (lambda (&optional _) + (if (eq evil-search-module 'evil-search) + #'evil-ex-search-next + #'evil-search-next)))) + +(defvar evil-collection-evil-search-previous + '(menu-item "" nil :filter (lambda (&optional _) + (if (eq evil-search-module 'evil-search) + #'evil-ex-search-previous + #'evil-search-previous)))) + (provide 'evil-collection) ;;; evil-collection.el ends here