From c89da6ed6c1a11da53facc9194d34b4eb85377c5 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 23 Mar 2016 12:00:17 -0400 Subject: [PATCH] Don't let 'jk' escape mess with electric indent --- core/core-defuns.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/core-defuns.el b/core/core-defuns.el index 69b5ea939..4c3f123ae 100644 --- a/core/core-defuns.el +++ b/core/core-defuns.el @@ -241,10 +241,16 @@ key-chord-define." ((null evt) (message "")) ((and (integerp evt) (or (char-equal evt ?k) (char-equal evt ?K))) + (if (evil-replace-state-p) (evil-replace-backspace) (delete-char -1)) (set-buffer-modified-p modified) + (when (and (bound-and-true-p electric-indent-mode) + narf-electric-indent-words + (eolp) + (looking-back (concat "\\<" (regexp-opt narf-electric-indent-words) "\\>"))) + (indent-according-to-mode)) (push 'escape unread-command-events)) (t (setq unread-command-events (append unread-command-events (list evt)))))))))