emacs
/
evil-collection
mirror of https://github.com/jojojames/evil-collection.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
evil-collection.el
View File

@ -254,7 +254,6 @@ See `evil-collection-init' and `evil-collection--modes-with-delayed-setup'."
newsticker newsticker
notmuch notmuch
nov nov
(occur replace)
omnisharp omnisharp
org org
org-present org-present
@ -276,6 +275,7 @@ See `evil-collection-init' and `evil-collection--modes-with-delayed-setup'."
racket-describe racket-describe
realgud realgud
reftex reftex
replace ;; For `occur'.
restclient restclient
rg rg
ripgrep ripgrep
@ -367,7 +367,6 @@ this confusing. It will be included if
(dired :defer t) (dired :defer t)
(info :defer t) (info :defer t)
(replace :defer t) (replace :defer t)
(occur :defer t)
(outline :defer t) (outline :defer t)
(package :defer t) (package :defer t)
(package-menu :defer t) (package-menu :defer t)

21
modes/occur/evil-collection-occur.el → modes/replace/evil-collection-replace.el
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> ;; Author: James Nguyen <james@jojojames.com>
;; Maintainer: 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/>. ;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary: ;;; Commentary:
;; Evil bindings for `occur'. ;; Evil bindings for `replace'.
;;; Code: ;;; Code:
(require 'evil-collection) (require 'evil-collection)
(require 'replace nil t)
(when (> emacs-major-version 25) (defconst evil-collection-replace-maps '(occur-mode-map
;; Specifying NOERROR pacifies package-lint occur-edit-mode-map))
(require 'replace nil t))
(defconst evil-collection-occur-maps '(occur-mode-map
occur-edit-mode-map))
;;;###autoload ;;;###autoload
(defun evil-collection-occur-setup () (defun evil-collection-replace-setup ()
"Set up `evil' bindings for `occur'." "Set up `evil' bindings for `occur'."
(evil-set-initial-state 'occur-mode 'normal) (evil-set-initial-state 'occur-mode 'normal)
@ -78,5 +75,5 @@
(kbd "C-o") 'occur-mode-display-occurrence (kbd "C-o") 'occur-mode-display-occurrence
(kbd "C-c C-f") 'next-error-follow-minor-mode)) (kbd "C-c C-f") 'next-error-follow-minor-mode))
(provide 'evil-collection-occur) (provide 'evil-collection-replace)
;;; evil-collection-occur.el ends here ;;; evil-collection-replace.el ends here