use set -eu

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index df56e12ea2133a6ea17ca5c34e8f20725ec973bd..64a622595dc9da1bc5bdd76f813e044423b05735 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -41,6 +41,11 @@ endif
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
 
+" Disallow :autocmd, shell and write commands in .vimrc and .exrc files in the
+" current directory. Only used if 'exrc' is enabled (off by default),
+" precaution just in case somebody enables 'exrc'.
+set secure
+
 " Use UTF-8 for all internal data (buffers, registers, etc.). This doesn't
 " affect reading files in different encodings, see 'fileencodings' for that.
 set encoding=utf-8
@@ -449,10 +454,10 @@ if has('statusline')
     set statusline+=:
     if has('modify_fname') && v:version >= 700 " some functions need 7.0
         set statusline+=%{SRF()}      " path to current file
-        set statusline+=\             " space after path
     else
-        set statusline+=%f\           " path to current file in buffer
+        set statusline+=%f            " path to current file in buffer
     endif
+    set statusline+=\                 " space after path
     set statusline+=%h                " [help] if buffer is help file
     set statusline+=%w                " [Preview] if buffer is preview buffer
     set statusline+=%m                " [+] if buffer was modified,
@@ -491,8 +496,10 @@ cnoremap jk <C-C>
 " And fix my typos ...
 inoremap JK <Esc>
 inoremap Jk <Esc>
+inoremap jK <Esc>
 cnoremap JK <C-C>
 cnoremap Jk <C-C>
+cnoremap jK <C-C>
 
 " Disable arrow keys for all modes except command modes. Thanks to James Vega
 " (http://git.jamessan.com/?p=etc/vim.git;a=summary).
@@ -615,9 +622,11 @@ if has('eval')
     nnoremap <silent> <Leader>t :call <SID>UseTabs()<CR>
 endif
 " Enable "verbatim" mode. Used to view files with long lines or without syntax
-" coloring.
-nnoremap <silent> <Leader>v :set nolist nowrap nospell synmaxcol=0<CR>
+" coloring. 'list' is not changed, see next mapping.
+nnoremap <silent> <Leader>v :setlocal nowrap nospell synmaxcol=0<CR>
                           \ :2match<CR>
+" Toggle 'list'.
+nnoremap <silent> <Leader>l :set invlist<CR>
 
 " Make last active window the only window. Similar to <C-W> o.
 nnoremap <C-W>O <C-W>p<C-W>o
@@ -763,7 +772,11 @@ inoreabbrev completly completely
 
 " Activate syntax coloring.
 if has('syntax')
-    syntax enable
+    " But only if it wasn't already active. Prevents breaking the syntax
+    " coloring when reloading the vimrc. Thanks to johnLate for the idea.
+    if !exists('g:syntax_on')
+        syntax enable
+    endif
 
 " Don't highlight more than 500 columns as I normally don't have that long
 " lines and they slow down syntax coloring. Thanks to Derek Wyatt