From 8671362aa9b056bca4833256dedbfa4606b0c726 Mon Sep 17 00:00:00 2001 From: Sorawee Porncharoenwase Date: Tue, 1 Jan 2019 23:54:14 -0800 Subject: [PATCH] evil-unimpaired switch from normal to motion state This change will make buffers with the motion state (e.g., spacemacs home buffer) be able to use the evil-unimpaired navigation key bindings. Note that the normal state will inherit the motion state map anyway, so there's no need to set the normal state map separately. --- CHANGELOG.develop | 2 ++ .../local/evil-unimpaired/evil-unimpaired.el | 25 ++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index 970590d68..1cb0a19aa 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -782,6 +782,8 @@ Other: - ~q~ exits the transient state (thanks to kenkangxgwe) - Added =link-hint-copy-link= to ~SPC x y~ (thanks to William Casarin) + - Added =evil-unimpaired= navigation keys prefixed by ~[~ and ~]~ to the + Spacemacs home buffer (thanks to Sorawee Porncharoenwase) - Improvements: - Rewrote window layout functions for ~SPC w 1~, ~SPC w 2~, ~SPC w 3~, and ~SPC w 4~ (thanks to Codruț Constantin Gușoi): diff --git a/layers/+spacemacs/spacemacs-evil/local/evil-unimpaired/evil-unimpaired.el b/layers/+spacemacs/spacemacs-evil/local/evil-unimpaired/evil-unimpaired.el index 86dc086ff..9146409bf 100644 --- a/layers/+spacemacs/spacemacs-evil/local/evil-unimpaired/evil-unimpaired.el +++ b/layers/+spacemacs/spacemacs-evil/local/evil-unimpaired/evil-unimpaired.el @@ -91,18 +91,19 @@ (define-key evil-visual-state-map (kbd "] e") ":move'>+1") ;; (define-key evil-visual-state-map (kbd "[ e") 'move-text-up) ;; (define-key evil-visual-state-map (kbd "] e") 'move-text-down) -(define-key evil-normal-state-map (kbd "[ b") 'previous-buffer) -(define-key evil-normal-state-map (kbd "] b") 'next-buffer) -(define-key evil-normal-state-map (kbd "[ f") 'evil-unimpaired/previous-file) -(define-key evil-normal-state-map (kbd "] f") 'evil-unimpaired/next-file) -(define-key evil-normal-state-map (kbd "] l") 'spacemacs/next-error) -(define-key evil-normal-state-map (kbd "[ l") 'spacemacs/previous-error) -(define-key evil-normal-state-map (kbd "] q") 'spacemacs/next-error) -(define-key evil-normal-state-map (kbd "[ q") 'spacemacs/previous-error) -(define-key evil-normal-state-map (kbd "[ t") 'evil-unimpaired/previous-frame) -(define-key evil-normal-state-map (kbd "] t") 'evil-unimpaired/next-frame) -(define-key evil-normal-state-map (kbd "[ w") 'previous-multiframe-window) -(define-key evil-normal-state-map (kbd "] w") 'next-multiframe-window) +;; navigation +(define-key evil-motion-state-map (kbd "[ b") 'previous-buffer) +(define-key evil-motion-state-map (kbd "] b") 'next-buffer) +(define-key evil-motion-state-map (kbd "[ f") 'evil-unimpaired/previous-file) +(define-key evil-motion-state-map (kbd "] f") 'evil-unimpaired/next-file) +(define-key evil-motion-state-map (kbd "] l") 'spacemacs/next-error) +(define-key evil-motion-state-map (kbd "[ l") 'spacemacs/previous-error) +(define-key evil-motion-state-map (kbd "] q") 'spacemacs/next-error) +(define-key evil-motion-state-map (kbd "[ q") 'spacemacs/previous-error) +(define-key evil-motion-state-map (kbd "[ t") 'evil-unimpaired/previous-frame) +(define-key evil-motion-state-map (kbd "] t") 'evil-unimpaired/next-frame) +(define-key evil-motion-state-map (kbd "[ w") 'previous-multiframe-window) +(define-key evil-motion-state-map (kbd "] w") 'next-multiframe-window) ;; select pasted text (define-key evil-normal-state-map (kbd "g p") (kbd "` [ v ` ]")) ;; paste above or below with newline