From a98ce27dab2b7e52cd5ac09d18eff10107e01f78 Mon Sep 17 00:00:00 2001 From: James Nguyen Date: Wed, 8 Nov 2017 08:17:09 -0800 Subject: [PATCH] Occur: Fix loading occur-mode is part of replace which is only provided in emacs26+ and builtin otherwise. --- evil-collection.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/evil-collection.el b/evil-collection.el index faad963..92237cf 100644 --- a/evil-collection.el +++ b/evil-collection.el @@ -96,6 +96,15 @@ instance: (require 'evil-calendar) (evil-calendar-setup))" (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) (let ((m mode) (reqs (list mode)))