" EDITOR SETTINGS
-" Make sure Vim (and not Vi) settings are enabled.
+" Make sure Vim (and not Vi) settings are used.
set nocompatible
" Load my scripts from ~/.vim (my scripts), ~/.vim/plugins (plugins) and
set runtimepath-=~/.vim
set runtimepath^=~/.vim,~/.vim/plugins,~/.vim/runtime
+" Disable modelines as they may cause security problems. Instead use
+" securemodelines (Vim script #1876).
+set nomodeline
+
" When completing paths first use the longest path then display a list of all
" possible files.
set wildmode=longest,list
" EDIT SETTINGS
" Enable automatic file detection, plugin and indention.
-if has("autocmd")
+if has('autocmd')
filetype plugin indent on
endif
-" Use UTF-8 file encoding for all files.
-set fileencodings=utf-8
+" Use UTF-8 file encoding for all files. Automatically recognize latin1 in
+" existing files.
+set fileencodings=utf-8,latin1
" Wrap text after 78 characters.
set textwidth=78
set virtualedit=block
" Already display matches while typing the search command. This makes spotting
-" errors easily.
+" errors easy.
set incsearch
" Activate syntax folding.
-if has("folding")
+if has('folding')
set foldmethod=syntax
set foldcolumn=2
- set foldlevel=99 " no folding at default
+ set foldlevel=99 " no closed folds at default, 'foldenable' would disable
+ " folding which is not what I want
endif
" Only check for case if the searched word contains a capital character.
set ignorecase
set smartcase
-" Activate spell checking, use English as default.
-if v:version >= 700
+" Activate spell checking, use English as default. Don't use spell checking
+" when diffing.
+if v:version >= 700 && !&diff
set spell
set spelllang=en_us
endif
+" Allow buffers with changes to be hidden.
+set hidden
+
" DISPLAY SETTINGS
set cursorline
endif
-" Display tabs as "^I" and trailing space as "-".
+" Display tabs, trailing space, non breakable spaces and long lines (when
+" wrapping is enabled).
set list
-set listchars=trail:-
+set listchars=trail:-,nbsp:!,extends:>
" MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
nnoremap <Space> <C-f>
nnoremap - <C-b>
+" Fast access to buffers.
+nnoremap <Leader>1 :1b<CR>
+nnoremap <Leader>2 :2b<CR>
+nnoremap <Leader>3 :3b<CR>
+nnoremap <Leader>4 :4b<CR>
+nnoremap <Leader>5 :5b<CR>
+nnoremap <Leader>6 :6b<CR>
+nnoremap <Leader>7 :7b<CR>
+nnoremap <Leader>8 :8b<CR>
+nnoremap <Leader>9 :9b<CR>
+nnoremap <Leader>0 :10b<CR>
+
" Maps to change spell language between English and German and disable it.
-map <Leader>sn :set nospell<CR>
-map <Leader>se :set spell spelllang=en_us<CR>
-map <Leader>sd :set spell spelllang=de_de<CR>
+if v:version >= 700
+ map <Leader>sn :set nospell<CR>
+ map <Leader>se :set spell spelllang=en_us<CR>
+ map <Leader>sd :set spell spelllang=de_de<CR>
+endif
" Add semicolon to the end of the line. Thanks to
" http://www.van-laarhoven.org/vim/.vimrc for this idea and godlygeek in #vim
-" for an improved version which doesn't clobber any marks.
+" on Freenode for an improved version which doesn't clobber any marks.
nnoremap <silent> ; :call setline(line('.'), getline('.') . ';')<CR>
" I often type "W" instead of "w" when trying to save a file. Fix my mistake.
endif
" Make sure xa0 (alt + space) is automatically changed to a normal whitespace
-" if pressed accidentally while in insert mode (happens on Mac sometimes).
-if has("mac")
+" if pressed accidentally while in insert mode (happens on Mac when alt
+" doesn't send escape). filereadable() is necessary for Leopard were 'mac' is
+" no longer set on the console.
+if has('mac') || filereadable('/Users/.localized')
imap <Char-0xa0> <Space>
endif
" Disable Apple style movements in MacVim.
-if has("gui_macvim") && has("eval")
+if has('gui_macvim') && has('eval')
let macvim_skip_cmd_opt_movement = 1
endif
" SYNTAX SETTINGS
" Activate syntax coloring.
-if has("syntax")
+if has('syntax')
syntax enable
" Highlight text longer then 78 characters. Thanks to Tony Mechelynck
else
match Todo /\%>78v./
endif
+
+" Highlight TODO, FIXME, CHANGED and XXX in all documents.
+ if v:version >= 701 && has('patch40')
+ call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)')
+ endif
endif
" Settings for the NERD commenter.
" Don't create any mappings I don't want to use.
-if has("eval")
+if has('eval')
let NERDCreateDefaultMappings = 0
endif
" Map toggle comment.
" Use a custom auto group to prevent problems when the vimrc files is sourced
" twice.
-if has("autocmd")
+if has('autocmd')
augroup vimrc
autocmd!