aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-14 10:08:42 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-14 10:08:42 +1300
commit91397bedc3f49d2843dc1e7d93222c8744ddc6e1 (patch)
treeb4bc50035696a9d56dd0cf16dd40131efe7233ae
parent9e6c1a55d4b00aa114393024421b564f56b7336d (diff)
parentccce54dfbe19834a3af24649076d6b045dd55da0 (diff)
downloaddotfiles-91397bedc3f49d2843dc1e7d93222c8744ddc6e1.tar.gz
Merge branch 'feature/vim-mapleader' into develop
* feature/vim-mapleader: Move mapleader settings before .vimrc conf source
-rw-r--r--vim/config/leader.vim5
-rw-r--r--vim/vimrc6
2 files changed, 6 insertions, 5 deletions
diff --git a/vim/config/leader.vim b/vim/config/leader.vim
deleted file mode 100644
index e17aed06..00000000
--- a/vim/config/leader.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-" Use different keys for global and local leaders
-if has('eval')
- let g:mapleader = '\'
- let g:maplocalleader = '_'
-endif
diff --git a/vim/vimrc b/vim/vimrc
index eab24946..a44c5d2f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,3 +1,9 @@
+" Use different keys for global and local leaders
+if has('eval')
+ let g:mapleader = '\'
+ let g:maplocalleader = '_'
+endif
+
" Load configuration files from ~/.vim/config or its analogue, before Pathogen
" loads all its directories into 'runtimepath'
runtime! config/*.vim