From d0ae648ff33c383a20736f63a807a804d55ab5a1 Mon Sep 17 00:00:00 2001 From: Eivind Fonn Date: Tue, 19 Apr 2016 14:21:45 +0200 Subject: [PATCH] Normalize keymaps in visual line toggle --- .../spacemacs-base/keybindings.el | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/layers/+distribution/spacemacs-base/keybindings.el b/layers/+distribution/spacemacs-base/keybindings.el index 357a1a69c..318f3a9b4 100644 --- a/layers/+distribution/spacemacs-base/keybindings.el +++ b/layers/+distribution/spacemacs-base/keybindings.el @@ -227,17 +227,22 @@ :evil-leader "tl") (spacemacs|add-toggle visual-line-navigation :status visual-line-mode - :on (progn - (visual-line-mode) - (evil-define-minor-mode-key 'motion 'visual-line-mode "j" 'evil-next-visual-line) - (evil-define-minor-mode-key 'motion 'visual-line-mode "k" 'evil-previous-visual-line) - (when (bound-and-true-p evil-escape-mode) - (evil-escape-mode -1) - (setq evil-escape-motion-state-shadowed-func nil) - (evil-define-minor-mode-key 'motion 'visual-line-mode "j" 'evil-next-visual-line) - (evil-define-minor-mode-key 'motion 'visual-line-mode "k" 'evil-previous-visual-line) - (evil-escape-mode))) - :off (visual-line-mode -1) + :on + (progn + (visual-line-mode) + (evil-define-minor-mode-key 'motion 'visual-line-mode "j" 'evil-next-visual-line) + (evil-define-minor-mode-key 'motion 'visual-line-mode "k" 'evil-previous-visual-line) + (when (bound-and-true-p evil-escape-mode) + (evil-escape-mode -1) + (setq evil-escape-motion-state-shadowed-func nil) + (evil-define-minor-mode-key 'motion 'visual-line-mode "j" 'evil-next-visual-line) + (evil-define-minor-mode-key 'motion 'visual-line-mode "k" 'evil-previous-visual-line) + (evil-escape-mode)) + (evil-normalize-keymaps)) + :off + (progn + (visual-line-mode -1) + (evil-normalize-keymaps)) :documentation "Move point according to visual lines." :evil-leader "tL") (spacemacs|add-toggle line-numbers