diff --git a/evil-collection-ag.el b/evil-collection-ag.el index 170cd0a..51c4b4d 100644 --- a/evil-collection-ag.el +++ b/evil-collection-ag.el @@ -29,6 +29,7 @@ ;;; Code: (require 'ag nil t) (require 'evil) +(require 'evil-collection-evil-search) (defun evil-collection-ag-setup () "Set up `evil' bindings for `ag'." @@ -48,8 +49,10 @@ "[" 'compilation-previous-error ;; search - "n" 'evil-search-next - "N" 'evil-search-previous) + "?" evil-collection-evil-search-backward + "/" evil-collection-evil-search-forward + "n" evil-collection-evil-search-next + "N" evil-collection-evil-search-previous) ;; `ag' is best set in 'normal state because its buffer can be edited. ;; https://github.com/mhayashi1120/Emacs-wgrep (evil-set-initial-state 'ag-mode 'normal)) diff --git a/evil-collection-compile.el b/evil-collection-compile.el index 82f7136..9c11518 100644 --- a/evil-collection-compile.el +++ b/evil-collection-compile.el @@ -29,6 +29,7 @@ ;;; Code: (require 'evil) (require 'compile) +(require 'evil-collection-evil-search) (defun evil-collection-compile-setup () "Set up `evil' bindings for `compile'." @@ -36,7 +37,7 @@ (evil-define-key 'normal compilation-mode-map "g?" 'describe-mode - "?" 'evil-search-backward + "?" evil-collection-evil-search-backward "gg" 'evil-goto-first-line "0" 'evil-digit-argument-or-evil-beginning-of-line [mouse-2] 'compile-goto-error diff --git a/evil-collection-evil-search.el b/evil-collection-evil-search.el new file mode 100644 index 0000000..d81581a --- /dev/null +++ b/evil-collection-evil-search.el @@ -0,0 +1,59 @@ +;;; 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/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 . + +;;; Commentary: +;;; Utility for `evil-search'. +;;; https://github.com/jojojames/evil-collection/issues/49 +;;; https://github.com/emacs-evil/evil-magit/issues/33 + +;;; Code: +(require '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 9b46455..0d5686b 100644 --- a/evil-collection-info.el +++ b/evil-collection-info.el @@ -44,8 +44,12 @@ "t" 'evil-find-char-to "T" 'evil-find-char-to-backward "f" 'evil-find-char - "n" 'evil-search-next - "?" 'evil-search-backward + + "?" evil-collection-evil-search-backward + "/" evil-collection-evil-search-forward + "n" evil-collection-evil-search-next + "N" evil-collection-evil-search-previous + (kbd "") 'Info-next-reference (kbd "S-") 'Info-prev-reference