X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=5be58ef57276222c21321af5f49db9cec62fe157;hb=4a3e3732def778c6ac94e0ff29b8ce3ec9768541;hp=d5555c48b1f39a0b1ddcfc2ae387cf1cfac9a476;hpb=2ed2c5e01f661ac81ffb78ba465333eb401f9ac9;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index d5555c4..5be58ef 100644
--- a/vimrc
+++ b/vimrc
@@ -3,13 +3,17 @@
 
 " 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
-" ~/.vim/runtime (checkout of Vim runtime files).
+" Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim
+" runtime files).
 set runtimepath-=~/.vim
-set runtimepath^=~/.vim,~/.vim/plugins,~/.vim/runtime
+set runtimepath^=~/.vim,~/.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.
@@ -24,12 +28,13 @@ endif
 " 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
@@ -64,11 +69,11 @@ set formatoptions+=l
 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 closed folds at default, 'foldenable' would disable
@@ -79,8 +84,9 @@ endif
 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
@@ -106,9 +112,10 @@ if v:version >= 700
     set cursorline
 endif
 
-" Display tabs, trailing space and non breakable spaces.
+" Display tabs, trailing space, non breakable spaces and long lines (when
+" wrapping is enabled).
 set list
-set listchars=trail:-,nbsp:!
+set listchars=trail:-,nbsp:!,extends:>
 
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
@@ -117,6 +124,18 @@ set listchars=trail:-,nbsp:!
 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.
 if v:version >= 700
     map <Leader>sn :set nospell<CR>
@@ -156,13 +175,15 @@ else
 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")
-    imap <Char-0xa0> <Space>
+" 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')
+    inoremap <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
 
@@ -170,7 +191,7 @@ endif
 " SYNTAX SETTINGS
 
 " Activate syntax coloring.
-if has("syntax")
+if has('syntax')
     syntax enable
 
 " Highlight text longer then 78 characters. Thanks to Tony Mechelynck
@@ -180,6 +201,11 @@ if has("syntax")
     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
 
 
@@ -187,7 +213,7 @@ 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.
@@ -198,10 +224,16 @@ map <Leader><Leader> <plug>NERDCommenterToggle
 
 " Use a custom auto group to prevent problems when the vimrc files is sourced
 " twice.
-if has("autocmd")
+if has('autocmd')
     augroup vimrc
         autocmd!
 
+" Go to last position of opened files. Taken from :help last-position-jump.
+        autocmd BufReadPost *
+            \ if line("'\"") > 1 && line("'\"") <= line("$") |
+            \     execute "normal! g'\"" |
+            \ endif
+
 " Use diff filetype for mercurial patches in patch queue.
         autocmd BufReadPost */.hg/patches/* set filetype=diff