From efb0f812c4eacb91a57bdcb778823783b09b8020 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Fri, 22 May 2015 21:23:53 -0400 Subject: [PATCH] Fix binding conflict with shell and evil-nerd-commenter Move `SPC ;` to `SPC '` for spawning the shell --- contrib/shell/README.md | 4 ++-- contrib/shell/packages.el | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/shell/README.md b/contrib/shell/README.md index 84518ab65..6cf90cf5f 100644 --- a/contrib/shell/README.md +++ b/contrib/shell/README.md @@ -53,7 +53,7 @@ to the following variables: ``` The default shell is quickly accessible via a the default shortcut key -SPC ;. +SPC '. ### Default shell position and height @@ -85,7 +85,7 @@ Default value is `/bin/bash`. Key Binding | Description ---------------------|------------------------------------------------------------ -SPC ; | Open, close or go to the default shell +SPC ' | Open, close or go to the default shell SPC a s e | Open, close or go to an `eshell` SPC a s i | Open, close or go to a `shell` SPC a s t | Open, close or go to a `term` diff --git a/contrib/shell/packages.el b/contrib/shell/packages.el index 0a73f2089..2798ca1c3 100644 --- a/contrib/shell/packages.el +++ b/contrib/shell/packages.el @@ -118,7 +118,7 @@ (interactive) (call-interactively (intern (format "shell-pop-%S" shell-default-shell)))) (evil-leader/set-key - ";" 'spacemacs/default-pop-shell + "'" 'spacemacs/default-pop-shell "ase" 'shell-pop-eshell "asi" 'shell-pop-shell "ast" 'shell-pop-ansi-term