X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=f469e3992cbf67e99ebb03086af1050bea92c01c;hb=18ec810d344e350085d8dce1c0952cafadca8f9d;hp=61a07040859e69570e18317fbebad844f193040b;hpb=363bce2670cc10f255e49f640f5ca1927fe5ba36;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 61a0704..f469e39 100644
--- a/vimrc
+++ b/vimrc
@@ -1,9 +1,29 @@
 " 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
 
@@ -48,14 +68,15 @@ 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")
     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.
@@ -68,6 +89,9 @@ if v:version >= 700
     set spelllang=en_us
 endif
 
+" Allow buffers with changes to be hidden.
+set hidden
+
 
 " DISPLAY SETTINGS
 
@@ -86,42 +110,40 @@ 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.
-if has("eval")
-    let mapleader = ","
-    let maplocalleader = ","
-endif
-
 " 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
-" 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.
@@ -130,18 +152,24 @@ nnoremap <silent> ; :call setline(line('.'), getline('.') . ';')<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