From 816099aa2b5c4c9237da68e11fdc3abc47bc851b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Codru=C8=9B=20Constantin=20Gu=C8=99oi?= Date: Thu, 30 Aug 2018 00:13:43 +0300 Subject: [PATCH] Fixes keybinding conflict with `fasd` layer The `SPC f a` keybinding was already used by the `fasd` layer so a workaround had to be found for the newly introduced one. Refs: c2e377c902ba5cbed9ef6be47c3fa7f45a8bb846 Refs: #11224 Thanks @agzam for pointing it out and investigating potential solutions. --- doc/DOCUMENTATION.org | 2 +- layers/+spacemacs/spacemacs-defaults/keybindings.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org index df12dacb3..32f052f9f 100644 --- a/doc/DOCUMENTATION.org +++ b/doc/DOCUMENTATION.org @@ -2369,7 +2369,7 @@ Files manipulation commands (start with ~f~): | Key Binding | Description | |-------------+--------------------------------------------------------------------------------------------------------| -| ~SPC f a~ | open a file and replace the current buffer with the new file | +| ~SPC f A~ | open a file and replace the current buffer with the new file | | ~SPC f b~ | go to file bookmarks | | ~SPC f c~ | copy current file to a different location | | ~SPC f C d~ | convert file from unix to dos encoding | diff --git a/layers/+spacemacs/spacemacs-defaults/keybindings.el b/layers/+spacemacs/spacemacs-defaults/keybindings.el index 53b49ab8b..e2d942e40 100644 --- a/layers/+spacemacs/spacemacs-defaults/keybindings.el +++ b/layers/+spacemacs/spacemacs-defaults/keybindings.el @@ -200,7 +200,7 @@ :evil-leader "e.") ;; file ----------------------------------------------------------------------- (spacemacs/set-leader-keys - "fa" 'spacemacs/find-file-and-replace-buffer + "fA" 'spacemacs/find-file-and-replace-buffer "fc" 'spacemacs/copy-file "fD" 'spacemacs/delete-current-buffer-file "fei" 'spacemacs/find-user-init-file