Take out occur compatibility code

This commit is contained in:
James Nguyen 2022-06-06 21:05:36 -04:00
parent d461f459f4
commit 79fc09b014
2 changed files with 10 additions and 14 deletions

View File

@ -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)

View File

@ -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 <james@jojojames.com>
;; Maintainer: James Nguyen <james@jojojames.com>
@ -24,20 +24,17 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;; 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