From 69fc80d7cfbf87071277ae2c463b892e29e66c65 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 24 Jun 2018 10:34:16 +0200 Subject: [PATCH] Revert "Fix evil-escape aborting multiedit too eagerly" This reverts commit ba1488279bc857b08bf7095aad88bac575a6ec3f. This hack is no longer necessary now that syl20bnr/evil-escape#83 was merged upstream. --- modules/feature/evil/config.el | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index e0dba46f5..f5d6ebb66 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -249,12 +249,6 @@ variable for an explanation of the defaults (in comments). See (add-hook 'pre-command-hook #'evil-escape-pre-command-hook) (evil-define-key* '(insert replace visual operator) 'global "\C-g" #'evil-escape) :config - ;; TODO PR this upstream - (defun +evil*escape-func (ret) - (if (eq evil-state 'multiedit-insert) - #'evil-multiedit-state - ret)) - (advice-add #'evil-escape-func :filter-return #'+evil*escape-func) ;; no `evil-escape' in minibuffer (add-hook 'evil-escape-inhibit-functions #'minibufferp))