Discovered setlocal and map <buffer>.

13 files changed, 156 insertions, 172 deletions

diff --git a/files/vim/ftplugin/css/css.vim b/files/vim/ftplugin/css/css.vim
index 0064fda..bbb1939 100644
--- a/files/vim/ftplugin/css/css.vim
+++ b/files/vim/ftplugin/css/css.vim
@@ -3,9 +3,17 @@
 "
 " Syntastic linters: csslint, prettycss, sstylelint
 
+let g:syntastic_css_csslint_args = "--ignore=order-alphabetical,ids"
 
+setlocal textwidth=80
 call matchadd('ColorColumn', '\%81v', 100)
 
-let g:syntastic_css_csslint_args = "--ignore=order-alphabetical,ids"
+" Tabs are expanded to 4 spaces
+setlocal tabstop=4 shiftwidth=4 noexpandtab
+" Don't show existing tabs
+setlocal nolist
 
-autocmd BufEnter *.css source ~/.vim/ftplugin/css/css_mappings.vim
+" Mappings
+nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/css/css.vim<CR>
+nnoremap <buffer> <leader>e :Errors<CR>
+nnoremap <buffer> <leader>s vi{!sort<CR>
diff --git a/files/vim/ftplugin/css/css_mappings.vim b/files/vim/ftplugin/css/css_mappings.vim
deleted file mode 100644
index c8c8ceb..0000000
--- a/files/vim/ftplugin/css/css_mappings.vim
+++ /dev/null
@@ -1,15 +0,0 @@
-" ~/.vim/ftplugin/css/css_mappings.vim
-" CSS-specific vim configuration (reloaded when entering buffer)
-
-" Tabs are expanded to 4 spaces
-set tabstop=4 shiftwidth=4 noexpandtab
-" Don't show existing tabs
-set nolist
-
-set textwidth=80
-
-" Mappings
-nnoremap <leader>Cc :sp ~/.vim/ftplugin/css/css.vim<CR>
-nnoremap <leader>Cm :sp ~/.vim/ftplugin/css/css_mappings.vim<CR>
-nnoremap <leader>e :Errors<CR>
-nnoremap <leader>s vi{!sort<CR>
diff --git a/files/vim/ftplugin/html/html.vim b/files/vim/ftplugin/html/html.vim
index fb1c4bd..53cf4f9 100644
--- a/files/vim/ftplugin/html/html.vim
+++ b/files/vim/ftplugin/html/html.vim
@@ -5,4 +5,61 @@
 
 call matchadd('ColorColumn', '\%101v', 100)
 
-autocmd BufEnter *.html source ~/.vim/ftplugin/html/html_mappings.vim
+nnoremap <buffer> <leader>o :!$BROWSER % &<CR><CR>
+nnoremap <buffer> <leader>f :!firefox --new-window % &<CR><CR>
+nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/html/html.vim<CR>
+nnoremap <buffer> <leader>e :Errors<CR>
+
+" Layout elements
+inoremap <buffer> <leader>hheader <header><Enter><Enter></header><Enter><++><Esc>kki
+inoremap <buffer> <leader>hnav <nav><Enter><Enter></nav><Enter><++><Esc>kki
+inoremap <buffer> <leader>hsection <section><Enter><Enter></section><Enter><++><Esc>kki
+inoremap <buffer> <leader>harticle <article><Enter><Enter></article><Enter><++><Esc>kki
+inoremap <buffer> <leader>hfooter <footer><Enter><Enter></footer><Enter><++><Esc>kki
+inoremap <buffer> <leader>haside <aside><Enter><Enter></aside><Enter><++><Esc>kki
+inoremap <buffer> <leader>hdiv <div class=""><Enter><++><Enter></div><Enter><++><Esc>?""<Enter>a
+
+" Headers and paragraphs
+inoremap <buffer> <leader>hh1 <h1></h1><Enter><++><Esc>?</h1><Enter>i
+inoremap <buffer> <leader>hh2 <h2></h2><Enter><++><Esc>?</h2><Enter>i
+inoremap <buffer> <leader>hh3 <h3></h3><Enter><++><Esc>?</h3><Enter>i
+inoremap <buffer> <leader>hh4 <h4></h4><Enter><++><Esc>?</h4><Enter>i
+inoremap <buffer> <leader>hh5 <h5></h5><Enter><++><Esc>?</h5><Enter>i
+inoremap <buffer> <leader>hh6 <h6></h6><Enter><++><Esc>?</h6><Enter>i
+inoremap <buffer> <leader>hp <p></p><Enter><++><Esc>?</p><Enter>i
+
+" Text formatting
+inoremap <buffer> <leader>hb <b></b><++><Esc>?</b><Enter>i
+inoremap <buffer> <leader>hi <i></i><++><Esc>?</i><Enter>i
+inoremap <buffer> <leader>hem <em></em><++><Esc>?</em><Enter>i
+inoremap <buffer> <leader>hcode <code></code><++><Esc>?</code><Enter>i
+inoremap <buffer> <leader>hsub <sub></sub><++><Esc>?</sub><Enter>i
+inoremap <buffer> <leader>hsup <sup></sup><++><Esc>?</sup><Enter>i
+inoremap <buffer> <leader>hcite <cite></cite><++><Esc>?</cite><Enter>i
+
+" Tables
+inoremap <buffer> <leader>htable <table border=""><Enter><caption><++></caption><Enter><thead><Enter><tr><Enter><++><Enter></tr><Enter></thead><Enter><tbody><Enter><++><Enter></tbody><Enter></table><Enter><++><Esc>?""<Enter>a
+inoremap <buffer> <leader>htr <tr><Enter><Enter></tr><Enter><++><Esc>kki
+inoremap <buffer> <leader>hth <th></th><Enter><++><Esc>?</<Enter>i
+inoremap <buffer> <leader>htd <td></td><Enter><++><Esc>?</<Enter>i
+
+" Lists
+inoremap <buffer> <leader>hul <ul><Enter><li></li><Enter><++><Enter></ul><Enter><++><Esc>?</l<Enter>i
+inoremap <buffer> <leader>hol <ol><Enter><li></li><Enter><++><Enter></ol><Enter><++><Esc>?</l<Enter>i
+inoremap <buffer> <leader>hli <li></li><Enter><++><Esc>?</<Enter>i
+
+" Forms
+inoremap <buffer> <leader>hform <form><Enter><fieldset><Enter><Enter></fieldset><Enter></form><Enter><++><Esc>3ki
+inoremap <buffer> <leader>hfs <fieldset><Enter><Enter></fieldset><Enter><++><Esc>kki
+inoremap <buffer> <leader>hlegend <legend></legend><Enter><++><Esc>?</<Enter>i
+inoremap <buffer> <leader>hlabel <label><input type="<++>"></label><Enter><++><Esc>?<i<Enter>i
+
+" Media
+inoremap <buffer> <leader>ha <a href=""><++></a><Enter><++><Esc>?""<Enter>a
+inoremap <buffer> <leader>himg <img src="" alt="<++>"><Enter><++><Esc>?""<Enter>a
+
+" Misc
+" Comment a line
+nnoremap <buffer> <leader>hc I<!-- <Esc>A --><Esc>0
+" Uncomment a line
+nnoremap <buffer> <leader>hC 05x/--><Enter>3x0
diff --git a/files/vim/ftplugin/html/html_mappings.vim b/files/vim/ftplugin/html/html_mappings.vim
deleted file mode 100644
index 2acd4fe..0000000
--- a/files/vim/ftplugin/html/html_mappings.vim
+++ /dev/null
@@ -1,63 +0,0 @@
-" ~/.vim/ftplugin/html/html_mappings.vim
-" HTML-specific vim mappings
-
-nnoremap <leader>o :!$BROWSER % &<CR><CR>
-nnoremap <leader>f :!firefox --new-window % &<CR><CR>
-nnoremap <leader>Cc :sp ~/.vim/ftplugin/html/html.vim<CR>
-nnoremap <leader>Cm :sp ~/.vim/ftplugin/html/html_mappings.vim<CR>
-nnoremap <leader>e :Errors<CR>
-
-" Layout elements
-inoremap <leader>hheader <header><Enter><Enter></header><Enter><++><Esc>kki
-inoremap <leader>hnav <nav><Enter><Enter></nav><Enter><++><Esc>kki
-inoremap <leader>hsection <section><Enter><Enter></section><Enter><++><Esc>kki
-inoremap <leader>harticle <article><Enter><Enter></article><Enter><++><Esc>kki
-inoremap <leader>hfooter <footer><Enter><Enter></footer><Enter><++><Esc>kki
-inoremap <leader>haside <aside><Enter><Enter></aside><Enter><++><Esc>kki
-inoremap <leader>hdiv <div class=""><Enter><++><Enter></div><Enter><++><Esc>?""<Enter>a
-
-" Headers and paragraphs
-inoremap <leader>hh1 <h1></h1><Enter><++><Esc>?</h1><Enter>i
-inoremap <leader>hh2 <h2></h2><Enter><++><Esc>?</h2><Enter>i
-inoremap <leader>hh3 <h3></h3><Enter><++><Esc>?</h3><Enter>i
-inoremap <leader>hh4 <h4></h4><Enter><++><Esc>?</h4><Enter>i
-inoremap <leader>hh5 <h5></h5><Enter><++><Esc>?</h5><Enter>i
-inoremap <leader>hh6 <h6></h6><Enter><++><Esc>?</h6><Enter>i
-inoremap <leader>hp <p></p><Enter><++><Esc>?</p><Enter>i
-
-" Text formatting
-inoremap <leader>hb <b></b><++><Esc>?</b><Enter>i
-inoremap <leader>hi <i></i><++><Esc>?</i><Enter>i
-inoremap <leader>hem <em></em><++><Esc>?</em><Enter>i
-inoremap <leader>hcode <code></code><++><Esc>?</code><Enter>i
-inoremap <leader>hsub <sub></sub><++><Esc>?</sub><Enter>i
-inoremap <leader>hsup <sup></sup><++><Esc>?</sup><Enter>i
-inoremap <leader>hcite <cite></cite><++><Esc>?</cite><Enter>i
-
-" Tables
-inoremap <leader>htable <table border=""><Enter><caption><++></caption><Enter><thead><Enter><tr><Enter><++><Enter></tr><Enter></thead><Enter><tbody><Enter><++><Enter></tbody><Enter></table><Enter><++><Esc>?""<Enter>a
-inoremap <leader>htr <tr><Enter><Enter></tr><Enter><++><Esc>kki
-inoremap <leader>hth <th></th><Enter><++><Esc>?</<Enter>i
-inoremap <leader>htd <td></td><Enter><++><Esc>?</<Enter>i
-
-" Lists
-inoremap <leader>hul <ul><Enter><li></li><Enter><++><Enter></ul><Enter><++><Esc>?</l<Enter>i
-inoremap <leader>hol <ol><Enter><li></li><Enter><++><Enter></ol><Enter><++><Esc>?</l<Enter>i
-inoremap <leader>hli <li></li><Enter><++><Esc>?</<Enter>i
-
-" Forms
-inoremap <leader>hform <form><Enter><fieldset><Enter><Enter></fieldset><Enter></form><Enter><++><Esc>3ki
-inoremap <leader>hfs <fieldset><Enter><Enter></fieldset><Enter><++><Esc>kki
-inoremap <leader>hlegend <legend></legend><Enter><++><Esc>?</<Enter>i
-inoremap <leader>hlabel <label><input type="<++>"></label><Enter><++><Esc>?<i<Enter>i
-
-" Media
-inoremap <leader>ha <a href=""><++></a><Enter><++><Esc>?""<Enter>a
-inoremap <leader>himg <img src="" alt="<++>"><Enter><++><Esc>?""<Enter>a
-
-" Misc
-" Comment a line
-nnoremap <leader>hc I<!-- <Esc>A --><Esc>0
-" Uncomment a line
-nnoremap <leader>hC 05x/--><Enter>3x0
-
diff --git a/files/vim/ftplugin/java/java.vim b/files/vim/ftplugin/java/java.vim
index 0c9fe43..2595b32 100644
--- a/files/vim/ftplugin/java/java.vim
+++ b/files/vim/ftplugin/java/java.vim
@@ -1,13 +1,14 @@
 " ~/.vim/ftplugin/java.vim
 " Java-specific vim configuration
 
-nnoremap <leader>gt :YcmCompleter GoTo<CR>
-nnoremap <leader>gr :YcmCompleter GoToReferences<CR>
-nnoremap <leader>fi :YcmCompleter FixIt<CR>
-nnoremap <leader>rr :YcmCompleter RefactorRename<Space>
-nnoremap <leader>e :YcmDiags<CR>
-nnoremap <leader>R :!./run.sh<CR>
-
 call matchadd('ColorColumn', '\%131v', 100)
 
 let g:syntastic_java_checkers = []
+
+nnoremap <buffer> <leader>gt :YcmCompleter GoTo<CR>
+nnoremap <buffer> <leader>gr :YcmCompleter GoToReferences<CR>
+nnoremap <buffer> <leader>fi :YcmCompleter FixIt<CR>
+nnoremap <buffer> <leader>rr :YcmCompleter RefactorRename<Space>
+nnoremap <buffer> <leader>e :YcmDiags<CR>
+nnoremap <buffer> <leader>R :!./run.sh<CR>
+
diff --git a/files/vim/ftplugin/javascript/javascript.vim b/files/vim/ftplugin/javascript/javascript.vim
index 71c66ba..1ca602c 100644
--- a/files/vim/ftplugin/javascript/javascript.vim
+++ b/files/vim/ftplugin/javascript/javascript.vim
@@ -3,10 +3,27 @@
 "
 " Syntastic linters: jslint
 
+" JSLint arguments
+let g:syntastic_javascript_jslint_args = "--browser --indent"
+
+" Tabs are expanded to 4 spaces
+setlocal tabstop=4 shiftwidth=4 expandtab
+" Show existing tabs (they can be deleted with :retab)
+setlocal list
+
 " Column marker: 80 characters
 call matchadd('ColorColumn', '\%81v', 100)
+setlocal textwidth=80
 
-" JSLint arguments
-let g:syntastic_javascript_jslint_args = "--browser --indent"
+" Mappings
+nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/javascript/javascript.vim<CR>
+
+nnoremap <buffer> <leader>gt :YcmCompleter GoTo<CR>
+nnoremap <buffer> <leader>gr :YcmCompleter GoToReferences<CR>
+nnoremap <buffer> <leader>fi :YcmCompleter FixIt<CR>
+nnoremap <buffer> <leader>r :YcmCompleter RefactorRename<Space>
+nnoremap <buffer> <leader>e :YcmDiags<CR>
+nnoremap <buffer> <leader>E :Errors<CR>
 
-autocmd BufEnter *.js source ~/.vim/ftplugin/javascript/javascript_BufEnter.vim
+inoremap <buffer> <leader>if if (<+++>) {<CR><++><CR>} <++><Esc>?<+++><CR>cf>
+inoremap <buffer> <leader>else else {<CR><+++><CR>}<CR><++><Esc>?<+++><CR>cf>
diff --git a/files/vim/ftplugin/javascript/javascript_BufEnter.vim b/files/vim/ftplugin/javascript/javascript_BufEnter.vim
deleted file mode 100644
index 6b8d852..0000000
--- a/files/vim/ftplugin/javascript/javascript_BufEnter.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-" ~/.vim/ftplugin/javascript/javascript_BufEnter.vim
-" JavaScript-specific vim configuration (reloaded when entering buffer)
-
-" Tabs are expanded to 4 spaces
-set tabstop=4 shiftwidth=4 expandtab
-" Show existing tabs (they can be deleted with :retab)
-set list
-
-set textwidth=80
-
-" Mappings
-nnoremap <leader>Cc :sp ~/.vim/ftplugin/javascript/javascript.vim<CR>
-nnoremap <leader>Cm :sp ~/.vim/ftplugin/javascript/javascript_BufEnter.vim<CR>
-
-inoremap <leader>if if (<+++>) {<CR><++><CR>} <++><Esc>?<+++><CR>cf>
-inoremap <leader>else else {<CR><+++><CR>}<CR><++><Esc>?<+++><CR>cf>
-
-nnoremap <leader>gt :YcmCompleter GoTo<CR>
-nnoremap <leader>gr :YcmCompleter GoToReferences<CR>
-nnoremap <leader>fi :YcmCompleter FixIt<CR>
-nnoremap <leader>r :YcmCompleter RefactorRename<Space>
-nnoremap <leader>e :YcmDiags<CR>
-
-nnoremap <leader>E :Errors<CR>
diff --git a/files/vim/ftplugin/python/python.vim b/files/vim/ftplugin/python/python.vim
index bb0e6f9..a67cab6 100644
--- a/files/vim/ftplugin/python/python.vim
+++ b/files/vim/ftplugin/python/python.vim
@@ -3,15 +3,15 @@
 
 " Column marker: 80 characters
 call matchadd('ColorColumn', '\%81v', 100)
-let b:syntastic_mode="passive"
+"let b:syntastic_mode="passive"
 
-nnoremap <leader>C :sp ~/.vim/ftplugin/python/python.vim<CR>
-nnoremap <leader>E :Errors<CR>
+nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/python/python.vim<CR>
+nnoremap <buffer> <leader>E :Errors<CR>
 
-nnoremap <leader>gt :YcmCompleter GoTo<CR>
-nnoremap <leader>gr :YcmCompleter GoToReferences<CR>
-nnoremap <leader>gd :YcmCompleter GetDoc<CR>
-nnoremap <leader>gT :YcmCompleter GetType<CR>
-nnoremap <leader>fi :YcmCompleter FixIt<CR>
-nnoremap <leader>r :YcmCompleter RefactorRename<Space>
-nnoremap <leader>e :YcmDiags<CR>
+nnoremap <buffer> <leader>gt :YcmCompleter GoTo<CR>
+nnoremap <buffer> <leader>gr :YcmCompleter GoToReferences<CR>
+nnoremap <buffer> <leader>gd :YcmCompleter GetDoc<CR>
+nnoremap <buffer> <leader>gT :YcmCompleter GetType<CR>
+nnoremap <buffer> <leader>fi :YcmCompleter FixIt<CR>
+nnoremap <buffer> <leader>r :YcmCompleter RefactorRename<Space>
+nnoremap <buffer> <leader>e :YcmDiags<CR>
diff --git a/files/vim/ftplugin/sent/sent.vim b/files/vim/ftplugin/sent/sent.vim
index 2479f71..c5813d5 100644
--- a/files/vim/ftplugin/sent/sent.vim
+++ b/files/vim/ftplugin/sent/sent.vim
@@ -1,8 +1,9 @@
 " ~/.vim/ftplugin/sent/sent.vim
 " Vim configuration for writing sent presentations
 
-set spell
-set textwidth=20
 call matchadd('ColorColumn', '\%21v')
+setlocal textwidth=20
+
+setlocal spell
 
 nnoremap ,r :w<CR>:!sent % & <CR><CR>
diff --git a/files/vim/ftplugin/sh/sh.vim b/files/vim/ftplugin/sh/sh.vim
index 202280d..f9c4a21 100644
--- a/files/vim/ftplugin/sh/sh.vim
+++ b/files/vim/ftplugin/sh/sh.vim
@@ -5,11 +5,11 @@
 
 call matchadd('ColorColumn', '\%101v', 100)
 
-nnoremap <leader>C :sp ~/.vim/ftplugin/sh/sh.vim<CR>
-nnoremap <leader>+x :!chmod 744 %<CR><CR>
-nnoremap <leader>x :w<CR>:!./%<Space>
-nnoremap <leader>e :Errors<CR>
+nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/sh/sh.vim<CR>
+nnoremap <buffer> <leader>+x :!chmod 744 %<CR><CR>
+nnoremap <buffer> <leader>x :w<CR>:!./%<Space>
+nnoremap <buffer> <leader>e :Errors<CR>
 
-inoremap <leader>sh #!/bin/sh
-inoremap <leader>if if <+++>; then<CR><++><CR>fi<++><Esc>?<+++><CR>cf>
-"inoremap <leader>if <Esc>:read ~/.vim/ftplugin/sh/snippets/if.txt<CR>kdd/<+++><CR>cf>
+inoremap <buffer> <leader>sh #!/bin/sh
+inoremap <buffer> <leader>if if <+++>; then<CR><++><CR>fi<++><Esc>?<+++><CR>cf>
+"inoremap <buffer> <leader>if <Esc>:read ~/.vim/ftplugin/sh/snippets/if.txt<CR>kdd/<+++><CR>cf>
diff --git a/files/vim/ftplugin/tex/tex.vim b/files/vim/ftplugin/tex/tex.vim
index 2215190..1414c60 100644
--- a/files/vim/ftplugin/tex/tex.vim
+++ b/files/vim/ftplugin/tex/tex.vim
@@ -5,29 +5,29 @@
 
 call matchadd('ColorColumn', '\%91v', 100)
 
-nnoremap <leader>C :sp ~/.vim/ftplugin/tex.vim<CR>
-nnoremap <leader>e :Errors<CR>
-" proselint not enabled by default (and better not be)
-nnoremap <leader>sp :SyntasticCheck proselint<CR>
+nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/tex.vim<CR>
+nnoremap <buffer> <leader>e :Errors<CR>
+" proselint not enabled by default (it's slow)
+nnoremap <buffer> <leader>sp :SyntasticCheck proselint<CR>
 
-nnoremap <leader>lc :w<Enter>:! pdflatex --shell-escape %<Enter>
-inoremap <leader>ldocclass \documentclass{}<Esc>o<++><Esc>k$i
-inoremap <leader>lpckg \usepackage{}<Esc>o<++><Esc>k$i
-inoremap <leader>lbdoc \begin{document}<Esc>o<Enter><Enter><Enter>\end{document}<Esc>kkI
-inoremap <leader>lauthor \author{}<Esc>o<++><Esc>k$i
-inoremap <leader>ltitle \title{}<Esc>o<++><Esc>k$i
-inoremap <leader>lsection \section{}<Esc>o<++><Esc>k$i
-inoremap <leader>lssection \subsection{}<Esc>o<++><Esc>k$i
-inoremap <leader>lsssection \subsubsection{}<Esc>o<++><Esc>k$i
-inoremap <leader>lssssection \paragraph{}<Esc>o<++><Esc>k$i
-inoremap <leader>lsssssection \subparagraph{}<Esc>o<++><Esc>k$i
-inoremap <leader>lb \textbf{}<++><Esc>F}i
-inoremap <leader>li \textit{}<++><Esc>F}i
-inoremap <leader>lemph \emph{}<++><Esc>F}i
-inoremap <leader>llabel \label{}<++><Esc>F}i
-inoremap <leader>lref ~\ref{}<++><Esc>F}i
-inoremap <leader>lenumerate \begin{enumerate}<Esc>o<Enter><Enter><Enter>\end{enumerate}<Esc>kkI\item<Enter><Esc>I<Tab><++><Esc>k<<i<Tab><Esc>$a<Space>
-inoremap <leader>litemize \begin{itemize}<Esc>o<Enter><Enter><Enter>\end{itemize}<Esc>kkI\item<Enter><Esc>I<Tab><++><Esc>k<<i<Tab><Esc>$a<Space>
-inoremap <leader>litem \item<Enter><++><Esc>k$a<Space>
-inoremap <leader>limage \begin{figure}[H]<Enter>\begin{center}<Enter>\includegraphics[width=\textwidth]{}<Enter>\caption{<++>}<Enter>\end{center}<Enter>\end{figure}<Enter><++><Esc>4k$i
-inoremap <leader>ltable \begin{table}[H]<Enter>\makebox[\linewidth]{\centering<Enter>\centering<Enter>\begin{tabular}{c<Space>cxxx}<Enter>\toprule<Enter><++><Space>&<Space><++><Space>\\<Enter>\midrule<Enter><++><Space>&<Space><++><Space>\\<Enter>\bottomrule<Enter>\end{tabular}<Enter>}<Enter>\end{table}<Enter><++><Esc>?xxx<Enter>cw
+nnoremap <buffer> <leader>c :w<Enter>:! pdflatex --shell-escape %<Enter>
+inoremap <buffer> <leader>ldocclass \documentclass{}<Esc>o<++><Esc>k$i
+inoremap <buffer> <leader>lpckg \usepackage{}<Esc>o<++><Esc>k$i
+inoremap <buffer> <leader>lbdoc \begin{document}<Esc>o<Enter><Enter><Enter>\end{document}<Esc>kkI
+inoremap <buffer> <leader>lauthor \author{}<Esc>o<++><Esc>k$i
+inoremap <buffer> <leader>ltitle \title{}<Esc>o<++><Esc>k$i
+inoremap <buffer> <leader>lsection \section{}<Esc>o<++><Esc>k$i
+inoremap <buffer> <leader>lssection \subsection{}<Esc>o<++><Esc>k$i
+inoremap <buffer> <leader>lsssection \subsubsection{}<Esc>o<++><Esc>k$i
+inoremap <buffer> <leader>lssssection \paragraph{}<Esc>o<++><Esc>k$i
+inoremap <buffer> <leader>lsssssection \subparagraph{}<Esc>o<++><Esc>k$i
+inoremap <buffer> <leader>lb \textbf{}<++><Esc>F}i
+inoremap <buffer> <leader>li \textit{}<++><Esc>F}i
+inoremap <buffer> <leader>lemph \emph{}<++><Esc>F}i
+inoremap <buffer> <leader>llabel \label{}<++><Esc>F}i
+inoremap <buffer> <leader>lref ~\ref{}<++><Esc>F}i
+inoremap <buffer> <leader>lenumerate \begin{enumerate}<Esc>o<Enter><Enter><Enter>\end{enumerate}<Esc>kkI\item<Enter><Esc>I<Tab><++><Esc>k<<i<Tab><Esc>$a<Space>
+inoremap <buffer> <leader>litemize \begin{itemize}<Esc>o<Enter><Enter><Enter>\end{itemize}<Esc>kkI\item<Enter><Esc>I<Tab><++><Esc>k<<i<Tab><Esc>$a<Space>
+inoremap <buffer> <leader>litem \item<Enter><++><Esc>k$a<Space>
+inoremap <buffer> <leader>limage \begin{figure}[H]<Enter>\begin{center}<Enter>\includegraphics[width=\textwidth]{}<Enter>\caption{<++>}<Enter>\end{center}<Enter>\end{figure}<Enter><++><Esc>4k$i
+inoremap <buffer> <leader>ltable \begin{table}[H]<Enter>\makebox[\linewidth]{\centering<Enter>\centering<Enter>\begin{tabular}{c<Space>cxxx}<Enter>\toprule<Enter><++><Space>&<Space><++><Space>\\<Enter>\midrule<Enter><++><Space>&<Space><++><Space>\\<Enter>\bottomrule<Enter>\end{tabular}<Enter>}<Enter>\end{table}<Enter><++><Esc>?xxx<Enter>cw
diff --git a/files/vim/ftplugin/text/text.vim b/files/vim/ftplugin/text/text.vim
index bf6b9ab..18239e7 100644
--- a/files/vim/ftplugin/text/text.vim
+++ b/files/vim/ftplugin/text/text.vim
@@ -3,10 +3,12 @@
 "
 " Syntastic linter: proselint
 
-nnoremap <leader>C :sp ~/.vim/ftplugin/text/text.vim<CR>
-nnoremap <leader>e :Errors<CR>
-
 call matchadd('ColorColumn', '\%101v', 100)
+setlocal textwidth=100
+setlocal spell
+
+nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/text/text.vim<CR>
 
 " Proselint is slow to act
-" let g:syntastic_text_checkers = ['proselint']
+nnoremap <buffer> <leader>sp :SyntasticCheck proselint<CR>
+nnoremap <buffer> <leader>e :Errors<CR>
diff --git a/files/vim/ftplugin/vimwiki/vimwiki.vim b/files/vim/ftplugin/vimwiki/vimwiki.vim
index 7164c1c..68970fd 100644
--- a/files/vim/ftplugin/vimwiki/vimwiki.vim
+++ b/files/vim/ftplugin/vimwiki/vimwiki.vim
@@ -3,19 +3,19 @@
 "
 " Syntastic linter: mdl, proselint, textlint
 
+let g:syntastic_vimwiki_checkers = ['markdown/mdl']
+
 " Tabs hate: tabs are expanded to 2 spaces
-set tabstop=2 shiftwidth=2 expandtab
+setlocal tabstop=2 shiftwidth=2 expandtab
 " Show existing tabs (they can be deleted with :retab)
-set list
+setlocal list
 
 " Column marker: 80 characters
 call matchadd('ColorColumn', '\%81v', 100)
-set textwidth=80
-
-let g:syntastic_vimwiki_checkers = ['markdown/mdl']
+setlocal textwidth=80
 
-nnoremap <leader>C :sp ~/.vim/ftplugin/vimwiki/vimwiki.vim<CR>
-nnoremap <leader>e :Errors<CR>
+nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/vimwiki/vimwiki.vim<CR>
+nnoremap <buffer> <leader>e :Errors<CR>
 
-nnoremap <leader>c :w<CR>:!toPDF.sh %<CR><CR>
-nnoremap <leader>o :w<CR>:!toPDF.sh -o %<CR><CR>
+nnoremap <buffer> <leader>c :w<CR>:!toPDF.sh %<CR><CR>
+nnoremap <buffer> <leader>o :w<CR>:!toPDF.sh -o %<CR><CR>