aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-03 20:35:23 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-03 20:35:23 +1300
commit3f586a3d48bb04ef9206a202235b54cfcec38859 (patch)
treea397b67d51b09fb8de35eabe004e2bc22693c207
parent57223ebc39f1de3327ff2073378ccda2cd1171c9 (diff)
downloaddotfiles-3f586a3d48bb04ef9206a202235b54cfcec38859.tar.gz
dotfiles-3f586a3d48bb04ef9206a202235b54cfcec38859.zip
Use <Leader>/<LocalLeader> correctly in Vim config
From ":help <LocalLeader>": > In a global plugin <Leader> should be used and in a filetype plugin > <LocalLeader>. "mapleader" and "maplocalleader" can be equal.
-rw-r--r--vim/config/format.vim6
-rw-r--r--vim/config/list.vim2
-rw-r--r--vim/config/number.vim2
-rw-r--r--vim/config/search.vim4
-rw-r--r--vim/config/spell.vim6
-rw-r--r--vim/config/whitespace.vim2
-rw-r--r--vim/config/wrap.vim4
-rw-r--r--vim/ftplugin/html.vim4
-rw-r--r--vim/ftplugin/perl.vim6
9 files changed, 18 insertions, 18 deletions
diff --git a/vim/config/format.vim b/vim/config/format.vim
index 35245d0d..b0de7621 100644
--- a/vim/config/format.vim
+++ b/vim/config/format.vim
@@ -38,8 +38,8 @@ if has('eval')
endfunction
" Map leader-letters to corresponding format option flags
- nnoremap <silent> <leader>a :<C-U>call <SID>ToggleFormatFlag('a')<CR>
- nnoremap <silent> <leader>c :<C-U>call <SID>ToggleFormatFlag('c')<CR>
- nnoremap <silent> <leader>t :<C-U>call <SID>ToggleFormatFlag('t')<CR>
+ nnoremap <silent> <Leader>a :<C-U>call <SID>ToggleFormatFlag('a')<CR>
+ nnoremap <silent> <Leader>c :<C-U>call <SID>ToggleFormatFlag('c')<CR>
+ nnoremap <silent> <Leader>t :<C-U>call <SID>ToggleFormatFlag('t')<CR>
endif
diff --git a/vim/config/list.vim b/vim/config/list.vim
index faf5e29a..209bb4ec 100644
--- a/vim/config/list.vim
+++ b/vim/config/list.vim
@@ -1,7 +1,7 @@
" Don't show whitespace characters or end-of-line characters visually by
" default, but make \l toggle between them
set nolist
-nnoremap <leader>l :setlocal list! list?<CR>
+nnoremap <Leader>l :setlocal list! list?<CR>
" Clearly show when the start or end of the row does not correspond to the
" start and end of the line
diff --git a/vim/config/number.vim b/vim/config/number.vim
index 35ec7efe..d7d9919c 100644
--- a/vim/config/number.vim
+++ b/vim/config/number.vim
@@ -1,3 +1,3 @@
" Don't show line numbers by default, but \n toggles them
set nonumber
-nnoremap <leader>n :setlocal number! number?<CR>
+nnoremap <Leader>n :setlocal number! number?<CR>
diff --git a/vim/config/search.vim b/vim/config/search.vim
index 66b81ab0..0f10eea5 100644
--- a/vim/config/search.vim
+++ b/vim/config/search.vim
@@ -3,11 +3,11 @@ if has('extra_search')
" Searching as I enter my pattern, \i toggles this
set incsearch
- nnoremap <leader>i :setlocal incsearch! incsearch?<CR>
+ nnoremap <Leader>i :setlocal incsearch! incsearch?<CR>
" Highlight search results, \h toggles this
set hlsearch
- nnoremap <leader>h :setlocal hlsearch! hlsearch?<CR>
+ nnoremap <Leader>h :setlocal hlsearch! hlsearch?<CR>
" Pressing ^L will clear highlighting until the next search-related
" operation; quite good because the highlighting gets distracting after
diff --git a/vim/config/spell.vim b/vim/config/spell.vim
index 046b50ff..6a0167d0 100644
--- a/vim/config/spell.vim
+++ b/vim/config/spell.vim
@@ -3,12 +3,12 @@ if has('spell')
" Don't check spelling by default, but bind \s to toggle this
set nospell
- nnoremap <leader>s :setlocal spell! spell?<CR>
+ nnoremap <Leader>s :setlocal spell! spell?<CR>
" Use New Zealand English for spelling by default (it's almost identical
" to British English), but bind \u to switch to US English and \z to
" switch back
set spelllang=en_nz
- nnoremap <leader>u :setlocal spelllang=en_us spelllang?<CR>
- nnoremap <leader>z :setlocal spelllang=en_nz spelllang?<CR>
+ nnoremap <Leader>u :setlocal spelllang=en_us spelllang?<CR>
+ nnoremap <Leader>z :setlocal spelllang=en_nz spelllang?<CR>
endif
diff --git a/vim/config/whitespace.vim b/vim/config/whitespace.vim
index cc2554bd..bfe2663d 100644
--- a/vim/config/whitespace.vim
+++ b/vim/config/whitespace.vim
@@ -52,6 +52,6 @@ if has('eval')
endfunction
" Map \x to the function just defined
- nnoremap <silent> <leader>x :<C-U>call <SID>StripTrailingWhitespace()<CR>
+ nnoremap <silent> <Leader>x :<C-U>call <SID>StripTrailingWhitespace()<CR>
endif
diff --git a/vim/config/wrap.vim b/vim/config/wrap.vim
index 0e5866d8..7a442e89 100644
--- a/vim/config/wrap.vim
+++ b/vim/config/wrap.vim
@@ -1,6 +1,6 @@
" Don't wrap by default, but use \w to toggle it on or off quickly
set nowrap
-nnoremap <leader>w :setlocal wrap! wrap?<CR>
+nnoremap <Leader>w :setlocal wrap! wrap?<CR>
" When wrapping text, if a line is so long that not all of it can be shown on
" the screen, show as much as possible anyway; by default Vim fills the left
@@ -58,7 +58,7 @@ if has('linebreak')
endfunction
" Map \b to defined function
- nnoremap <silent> <leader>b :<C-U>call <SID>ToggleBreak()<CR>
+ nnoremap <silent> <Leader>b :<C-U>call <SID>ToggleBreak()<CR>
endif
endif
diff --git a/vim/ftplugin/html.vim b/vim/ftplugin/html.vim
index 3f28e9ea..309b7132 100644
--- a/vim/ftplugin/html.vim
+++ b/vim/ftplugin/html.vim
@@ -1,5 +1,5 @@
" Run tidy -eq -utf8 on file for the current buffer
-nnoremap <leader>v :exe "!tidy -eq -utf8 " . shellescape(expand("%"))<CR>
+nnoremap <LocalLeader>v :exe "!tidy -eq -utf8 " . shellescape(expand("%"))<CR>
" Make a bare URL into a link to itself
function! s:UrlLink()
@@ -8,4 +8,4 @@ function! s:UrlLink()
normal! E
execute "normal! a</a>\<Esc>"
endfunction
-nnoremap <silent> <leader>r :<C-U>call <SID>UrlLink()<CR>
+nnoremap <silent> <LocalLeader>r :<C-U>call <SID>UrlLink()<CR>
diff --git a/vim/ftplugin/perl.vim b/vim/ftplugin/perl.vim
index dad2ce35..53341183 100644
--- a/vim/ftplugin/perl.vim
+++ b/vim/ftplugin/perl.vim
@@ -1,6 +1,6 @@
" Run perl -c on file for the current buffer
-nnoremap <leader>pc :exe "!perl -c " . shellescape(expand("%"))<CR>
+nnoremap <LocalLeader>pc :exe "!perl -c " . shellescape(expand("%"))<CR>
" Run perlcritic on the file for the current buffer
-nnoremap <leader>pl :exe "!perlcritic " . shellescape(expand("%"))<CR>
+nnoremap <LocalLeader>pl :exe "!perlcritic " . shellescape(expand("%"))<CR>
" Run the current buffer through perltidy
-nnoremap <leader>pt :%!perltidy<CR>
+nnoremap <LocalLeader>pt :%!perltidy<CR>