Merge remote branch 'rammstein/master'

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index d8bd27c8471e480da246aa8d7693bb4089baedc5..b0665efb553d9ce198950d1fcc9884fbc8a893cb 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -11,9 +11,18 @@ if $HOME == '/root' || exists('$SUDO_USER')
 endif
 
 
-" Reset all options (except 'term, 'lines' and 'columns'). This makes sure a
+" Save 'runtimepath' in case it was changed by the system's configuration
+" files.
+if has('eval')
+    let s:save_runtimepath = &runtimepath
+endif
+" Reset all options (except 'term', 'lines' and 'columns'). This makes sure a
 " system wide configuration file doesn't change default values.
 set all&
+" And restore it after all other options were reset.
+if has('eval')
+    let &runtimepath = s:save_runtimepath
+endif
 
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
@@ -23,6 +32,9 @@ set nocompatible
 set runtimepath-=~/.vim
 set runtimepath^=~/.vim,~/.vim/runtime
 
+" Don't store swap files in the same directory as the edited file.
+set directory-=.
+
 " Disable modelines as they may cause security problems. Instead use
 " securemodelines (Vim script #1876).
 set nomodeline
@@ -31,6 +43,11 @@ set nomodeline
 " possible files.
 set wildmode=longest,list
 
+" Use strong encryption if possible, also used for swap/undo files.
+if v:version >= 703
+    set cryptmethod=blowfish
+endif
+
 
 " EDIT SETTINGS
 
@@ -122,6 +139,10 @@ set ruler
 " Display partial commands in the status line.
 set showcmd
 
+" Don't redraw screen when executing macros; increases speed. Thanks to James
+" Vega (http://git.jamessan.com/?p=etc/vim.git;a=summary).
+set lazyredraw
+
 " Visualize the line the cursor is currently in.
 if v:version >= 700
     set cursorline
@@ -161,6 +182,9 @@ endif
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
 
+" Easy way to exit insert mode.
+inoremap jj <Esc>
+
 " Disable arrow keys for all modes except command modes. Thanks to James Vega
 " (http://git.jamessan.com/?p=etc/vim.git;a=summary).
 map <right> <nop>
@@ -171,11 +195,25 @@ imap <right> <nop>
 imap <left>  <nop>
 imap <up>    <nop>
 imap <down>  <nop>
+" Also disable up and down array in command mode, use <C-p>/<C-n> as
+" replacement (see below).
+cmap <up> <nop>
+cmap <down> <nop>
+
+" Use Ctrl-P/Ctrl-N as replacement for <Up>/<Down> in command mode. Thanks to
+" abstrakt and grayw in #vim on Freenode (2010-04-12 21:20).
+cnoremap <C-p> <up>
+cnoremap <C-n> <down>
 
 " Use <space> to move down a page and - to move up one like in mutt.
 nnoremap <Space> <C-f>
 nnoremap - <C-b>
 
+" Go to next and previous buffer. Thanks to elik in #vim on Freenode
+" (2010-05-16 18:38) for this idea.
+nnoremap <silent> gb :bnext<CR>
+nnoremap <silent> gB :bprev<CR>
+
 " Fast access to buffers.
 nnoremap <Leader>1 :1b<CR>
 nnoremap <Leader>2 :2b<CR>
@@ -253,6 +291,11 @@ endif
 if has('syntax')
     syntax enable
 
+" Don't highlight more than 200 columns as I normally don't have that long
+" lines and they slow down syntax coloring. Thanks to Derek Wyatt
+" (http://www.derekwyatt.org/vim/the-vimrc-file/).
+    set synmaxcol=200
+
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
 " disabled when necessary with :2match (in Vim >= 700).
@@ -279,6 +322,17 @@ endif
 " Map toggle comment.
 map <Leader><Leader> <plug>NERDCommenterToggle
 
+" XPTemplate settings.
+if has('eval')
+    " Try to maintain snippet rendering even after editing outside of a
+    " snippet.
+    let g:xptemplate_strict = 0
+    " Don't complete any braces automatically.
+    let g:xptemplate_brace_complete = 0
+    " Only highlight the current placeholder.
+    let g:xptemplate_highlight = 'current'
+endif
+
 
 " AUTO COMMANDS