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

occur: Simplify loading process

This commit is contained in:
Pierre Neidhardt 2017-11-10 12:38:08 +01:00
parent 9c263e5e53
commit bd0ffafcb9
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
evil-collection.el
View File

@ -35,7 +35,7 @@
;;; Code: ;;; Code:
(defvar evil-collection-mode-list (defvar evil-collection-mode-list
'(ag `(ag
arc-mode arc-mode
bookmark bookmark
calendar calendar
@ -63,7 +63,8 @@
ivy ivy
macrostep macrostep
man man
occur ;; occur is in replace.el which was built-in before Emacs 26.
(occur ,(if (<= emacs-major-version 25) "replace" 'replace))
outline outline
p4 p4
(package-menu package) (package-menu package)
@ -96,15 +97,6 @@ instance:
(require 'evil-calendar) (require 'evil-calendar)
(evil-calendar-setup))" (evil-calendar-setup))"
(interactive) (interactive)
;; We need to special case `occur' since it exists in `replace'.
(when (memq 'occur evil-collection-mode-list)
(if (<= emacs-major-version 25)
(progn
(require 'evil-occur)
(evil-occur-setup))
(with-eval-after-load 'replace
(require 'evil-occur)
(evil-occur-setup))))
(dolist (mode evil-collection-mode-list) (dolist (mode evil-collection-mode-list)
(let ((m mode) (let ((m mode)
(reqs (list mode))) (reqs (list mode)))