vimrc: set secure

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 26c4f5f691216431d555fab0cc5d321989e7b1c9..8b394d0689aed7e53c3b49680a03683eaf551858 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
@@ -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).
@@ -763,7 +770,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