Merge branch 'release/v0.5.0'v0.5.0

* release/v0.5.0: (25 commits)
  Bump version number to 0.5.0
  Update documentation to reflect ftplugin changes
  Add lint mapping for Vimscript
  Specify scope of mapleader variables
  Use underscore as local map leader
  Add check and lint mappings for shell script
  Add tidy mapping for HTML
  Break long lines in check/lint/tidy mappings
  Make all lint/check/tidy maps local and silent
  Improve comments on check/lint/tidy maps
  Use long form options for tidy(1) Vim call
  Use direct :write !cmd instead of shellescape()
  Use full ':execute' not just ':exe' in VimL
  Check for availability of Vim shellescape()
  Revert "Adjust UrlLink() to yank word without t...
  Adjust UrlLink() to yank word without text objects
  Refactor UrlLink() function normal! commands
  Use single quotes for HTML link mapping :execute
  Refactor HTML tidy(1) mapping
  Use <Leader>/<LocalLeader> correctly in Vim config
  ...

9 files changed, 19 insertions, 14 deletions

diff --git a/vim/config/command.vim b/vim/config/command.vim
index 1d2b647a..2a60bab3 100644
--- a/vim/config/command.vim
+++ b/vim/config/command.vim
@@ -22,7 +22,9 @@ set shellpipe=>
 
 " Always use forward slashes, I very seldom need to use Vim on Windows for
 " more than scratch space anyway
-set shellslash
+if exists('+shellslash')
+  set shellslash
+endif
 
 " Tolerate typos like :Wq, :Q, or :Qa and do what I mean, including any
 " arguments or modifiers; I fat-finger these commands a lot because I type
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/leader.vim b/vim/config/leader.vim
new file mode 100644
index 00000000..9ca8f762
--- /dev/null
+++ b/vim/config/leader.vim
@@ -0,0 +1,3 @@
+" Use different keys for global and local leaders
+let g:mapleader = '\'
+let g:maplocalleader = '_'
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