diff --git a/evil-collection.el b/evil-collection.el index eeef06f..9f18622 100644 --- a/evil-collection.el +++ b/evil-collection.el @@ -254,7 +254,6 @@ See `evil-collection-init' and `evil-collection--modes-with-delayed-setup'." newsticker notmuch nov - (occur replace) omnisharp org org-present @@ -276,6 +275,7 @@ See `evil-collection-init' and `evil-collection--modes-with-delayed-setup'." racket-describe realgud reftex + replace ;; For `occur'. restclient rg ripgrep @@ -367,7 +367,6 @@ this confusing. It will be included if (dired :defer t) (info :defer t) (replace :defer t) - (occur :defer t) (outline :defer t) (package :defer t) (package-menu :defer t) diff --git a/modes/occur/evil-collection-occur.el b/modes/replace/evil-collection-replace.el similarity index 82% rename from modes/occur/evil-collection-occur.el rename to modes/replace/evil-collection-replace.el index 392ee5f..5dc91e4 100644 --- a/modes/occur/evil-collection-occur.el +++ b/modes/replace/evil-collection-replace.el @@ -1,6 +1,6 @@ -;;; evil-collection-occur.el --- Evil bindings for occur -*- lexical-binding: t -*- +;;; evil-collection-replace.el --- Evil bindings for `replace' -*- lexical-binding: t -*- -;; Copyright (C) 2017 James Nguyen +;; Copyright (C) 2022 James Nguyen ;; Author: James Nguyen ;; Maintainer: James Nguyen @@ -24,20 +24,17 @@ ;; along with this program. If not, see . ;;; Commentary: -;; Evil bindings for `occur'. +;; Evil bindings for `replace'. ;;; Code: (require 'evil-collection) +(require 'replace nil t) -(when (> emacs-major-version 25) - ;; Specifying NOERROR pacifies package-lint - (require 'replace nil t)) - -(defconst evil-collection-occur-maps '(occur-mode-map - occur-edit-mode-map)) +(defconst evil-collection-replace-maps '(occur-mode-map + occur-edit-mode-map)) ;;;###autoload -(defun evil-collection-occur-setup () +(defun evil-collection-replace-setup () "Set up `evil' bindings for `occur'." (evil-set-initial-state 'occur-mode 'normal) @@ -78,5 +75,5 @@ (kbd "C-o") 'occur-mode-display-occurrence (kbd "C-c C-f") 'next-error-follow-minor-mode)) -(provide 'evil-collection-occur) -;;; evil-collection-occur.el ends here +(provide 'evil-collection-replace) +;;; evil-collection-replace.el ends here