X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=b200fa4b63a2710da59db4995b0993cff65a8b47;hb=ed477ab1941771cf9a96ab54d7f8fea9ba05ac94;hp=3d269fa0634e3c84a5ff08547dda922e8503dfbe;hpb=267c1bb661b467c3e663eee4cbde97cffa04b524;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 3d269fa..b200fa4 100644
--- a/vimrc
+++ b/vimrc
@@ -1,17 +1,40 @@
 " Vim main configuration file.
 
 
+" EDITOR SETTINGS
+
 " Make sure Vim (and not Vi) settings are enabled.
 set nocompatible
 
+" Load my scripts from ~/.vim (my scripts), ~/.vim/plugins (plugins) and
+" ~/.vim/runtime (checkout of Vim runtime files).
+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
+
+" Increase number of tabs which can be opened with the -p option.
+if v:version >= 700
+    set tabpagemax=50
+endif
+
 
 " EDIT SETTINGS
 
 " Enable automatic file detection, plugin and indention.
-filetype plugin indent on
+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
@@ -46,13 +69,16 @@ 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.
-set foldmethod=syntax
-set foldcolumn=2
-set foldlevel=99 " no folding at default
+if has('folding')
+    set foldmethod=syntax
+    set foldcolumn=2
+    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
@@ -64,6 +90,9 @@ if v:version >= 700
     set spelllang=en_us
 endif
 
+" Allow buffers with changes to be hidden.
+set hidden
+
 
 " DISPLAY SETTINGS
 
@@ -82,36 +111,41 @@ if v:version >= 700
     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:-
-
-
-" EDITOR SETTINGS
-
-" When completing paths first use the longest path then display a list of all
-" possible files.
-set wildmode=longest,list
-
-" Increase number of tabs which can be opened with the -p option.
-if v:version >= 700
-    set tabpagemax=50
-endif
+set listchars=trail:-,nbsp:!,extends:>
 
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
 
-" Use "," as my mapleader.
-let mapleader = ","
-let maplocalleader = ","
-
 " Use <space> to move down a page and - to move up one like in mutt.
 nnoremap <Space> <C-f>
 nnoremap - <C-b>
 
-" Maps to change spell language between English and German.
-map <Leader>se :set spelllang=en_us<CR>
-map <Leader>sd :set spelllang=de_de<CR>
+" 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>
+    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
+" 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.
 " Thanks to Tony Mechelynck <antoine.mechelynck@gmail.com> from the Vim
@@ -119,28 +153,34 @@ map <Leader>sd :set spelllang=de_de<CR>
 if v:version < 700
     cnoreabbrev W w
     cnoreabbrev Wq wq
+    cnoreabbrev Wqa wqa
 else
     cnoreabbrev <expr> W
         \ ((getcmdtype() == ':' && getcmdpos() <= 2) ? 'w' : 'W')
     cnoreabbrev <expr> Wq
         \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'wq' : 'Wq')
+    cnoreabbrev <expr> Wqa
+        \ ((getcmdtype() == ':' && getcmdpos() <= 4) ? 'wqa' : 'Wqa')
 endif
 " Also fix my typo with "Q".
 if v:version < 700
     cnoreabbrev Q q
+    cnoreabbrev Qa qa
 else
     cnoreabbrev <expr> Q
         \ ((getcmdtype() == ':' && getcmdpos() <= 2) ? 'q' : 'Q')
+    cnoreabbrev <expr> Qa
+        \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'qa' : 'Qa')
 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 has('mac')
     imap <Char-0xa0> <Space>
 endif
 
 " Disable Apple style movements in MacVim.
-if has("gui_macvim")
+if has('gui_macvim') && has('eval')
     let macvim_skip_cmd_opt_movement = 1
 endif
 
@@ -148,7 +188,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
@@ -165,6 +205,23 @@ endif
 
 " Settings for the NERD commenter.
 " Don't create any mappings I don't want to use.
-let NERDCreateDefaultMappings = 0
+if has('eval')
+    let NERDCreateDefaultMappings = 0
+endif
 " Map toggle comment.
 map <Leader><Leader> <plug>NERDCommenterToggle
+
+
+" AUTO COMMANDS
+
+" Use a custom auto group to prevent problems when the vimrc files is sourced
+" twice.
+if has('autocmd')
+    augroup vimrc
+        autocmd!
+
+" Use diff filetype for mercurial patches in patch queue.
+        autocmd BufReadPost */.hg/patches/* set filetype=diff
+
+    augroup END
+endif