Use featurep check
This also gates requiring evil-collection-integration. The rationale is that it's probably better not to require both evil-collection-integration and evil-integration together as that might cause weirder behavior than the alternative.
This commit is contained in:
parent
268f8c333d
commit
f8fc2e9baf
|
@ -33,13 +33,12 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
;; FIXME: Is this the best way to do this?
|
||||
(when (bound-and-true-p evil-want-integration)
|
||||
(message
|
||||
"Make sure to set ~evil-want-integration~ before loading evil or evil-collection."))
|
||||
|
||||
(require 'evil)
|
||||
(require 'evil-collection-integration)
|
||||
|
||||
(if (featurep 'evil-integration)
|
||||
(message
|
||||
"Make sure to set ~evil-want-integration~ to nil before loading evil or evil-collection.")
|
||||
(require 'evil-collection-integration))
|
||||
|
||||
(defgroup evil-collection nil
|
||||
"A set of keybindings for Evil mode"
|
||||
|
|
Loading…
Reference in New Issue