X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=vimrc;h=644b59c1ac9aa2fe93f40dea0dda31842b9b915f;hb=2f291940dcca8ae31d4c5c523ad254e75169f56f;hp=c9539b6b04150262b369a49d52fa2c4112d1a339;hpb=871051b22ee37e1c84b8a8debd8cd38ba71d78a2;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index c9539b6..644b59c 100644
--- a/vimrc
+++ b/vimrc
@@ -11,6 +11,10 @@ set nocompatible
 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
@@ -71,7 +75,8 @@ set incsearch
 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.
@@ -84,6 +89,9 @@ if v:version >= 700
     set spelllang=en_us
 endif
 
+" Allow buffers with changes to be hidden.
+set hidden
+
 
 " DISPLAY SETTINGS
 
@@ -102,9 +110,10 @@ 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:-
+set listchars=trail:-,nbsp:!,extends:>
 
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
@@ -113,13 +122,28 @@ set listchars=trail:-
 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.