From 5c9e21814e2907eaaedaed156afc602526af0815 Mon Sep 17 00:00:00 2001 From: Mike Chen <517926804@qq.com> Date: Fri, 28 Aug 2020 15:40:08 +0800 Subject: [PATCH 1/2] Fix non evil environment (void variable evil this operator) --- modules/config/default/autoload/deferred.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/config/default/autoload/deferred.el b/modules/config/default/autoload/deferred.el index 41686e449..f85906925 100644 --- a/modules/config/default/autoload/deferred.el +++ b/modules/config/default/autoload/deferred.el @@ -13,7 +13,8 @@ (setq prefix-arg current-prefix-arg unread-command-events (mapcar (lambda (e) (cons t e)) - (vconcat (when evil-this-operator + (vconcat (when (and (fboundp 'evil-this-operator) + evil-this-operator) (where-is-internal evil-this-operator evil-normal-state-map t)) From f22f2e28b8b56b5ca50211faf54fb3fc90895193 Mon Sep 17 00:00:00 2001 From: Mike Chen <517926804@qq.com> Date: Fri, 28 Aug 2020 15:57:58 +0800 Subject: [PATCH 2/2] Modifying wrong variable judgment logic --- modules/config/default/autoload/deferred.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/config/default/autoload/deferred.el b/modules/config/default/autoload/deferred.el index f85906925..4ecfb67ad 100644 --- a/modules/config/default/autoload/deferred.el +++ b/modules/config/default/autoload/deferred.el @@ -13,8 +13,7 @@ (setq prefix-arg current-prefix-arg unread-command-events (mapcar (lambda (e) (cons t e)) - (vconcat (when (and (fboundp 'evil-this-operator) - evil-this-operator) + (vconcat (when (bound-and-true-p evil-this-operator) (where-is-internal evil-this-operator evil-normal-state-map t))