X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=81c8f1b8132ac7e7711b7e05e208956c47106a36;hb=2020e853579397d5379da962b82bb85c64d39856;hp=732941ae20f8cc35c74dad34832af7e222304f52;hpb=ec8f28407574099220c8a6f459df2a4a004d02b5;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 732941a..81c8f1b 100644
--- a/vimrc
+++ b/vimrc
@@ -69,8 +69,8 @@ set history=1000
 " Increase number of possible undos.
 set undolevels=1000
 
+" Remember marks (including the last cursor position) for more files.
 if has('viminfo')
-    " Remember marks (including the last cursor position) for more files.
     set viminfo^='1000
 endif
 
@@ -235,6 +235,14 @@ if v:version >= 700
     set listchars+=nbsp:!
 endif
 
+" Don't draw the vertical split separator by using space as character. Thanks
+" to scp1 in #vim on Freenode (2012-06-16 16:12 CEST) for the idea to use a
+" non-breakable space. But a simple space works as well, as long as the
+" current color scheme is not reset.
+if has('windows') && has('folding')
+    set fillchars+=vert:\  " comment to prevent trailing whitespace
+endif
+
 if has('statusline')
     " Always display the status line even if there is only one window.
     set laststatus=2
@@ -365,7 +373,7 @@ nmap - <C-B>
 " Go to next and previous buffer. Thanks to elik in #vim on Freenode
 " (2010-05-16 18:38 CEST) for this idea.
 nnoremap <silent> gb :bnext<CR>
-nnoremap <silent> gB :bprev<CR>
+nnoremap <silent> gB :bprevious<CR>
 
 " Fast access to buffers.
 nnoremap <silent> <Leader>1 :1buffer<CR>
@@ -502,9 +510,11 @@ endif
 
 " ABBREVIATIONS
 
-" Fix some of my spelling mistakes.
+" Fix some of my spelling mistakes (German).
 inoreabbrev relle reelle
 inoreabbrev reele reelle
+" Fix some of my spelling mistakes (English).
+inoreabbrev completly completely
 
 
 " SYNTAX SETTINGS
@@ -576,7 +586,8 @@ if has('syntax')
                   \ '|     call matchadd("Error", "\\%u" . l:x)'
                   \ '| endfor'
 
-" Reduce visibility of tabs in contrast to normal SpecialKeys.
+" Special highlight for tabs to reduce their visibility in contrast to other
+" SpecialKey characters (e.g. ^L).
             if &t_Co == 256 && <SID>HasSyntaxGroup('specialKeyTab')
                 call matchadd('specialKeyTab', '\t')
             endif
@@ -593,6 +604,8 @@ if has('syntax')
 
 " Settings for specific filetypes.
 
+    " C
+    let g:c_no_if0_fold = 1 " fix weird double fold in #if0 in recent versions
     " Haskell.
     let g:hs_highlight_delimiters = 1
     let g:hs_highlight_boolean = 1
@@ -627,11 +640,17 @@ if has('eval')
         silent! execute 'call pathogen#runtime_append_all_bundles()'
     endif
 
+" Settings for securemodelines.
+    " Only allow items I need (also includes spl which is not enabled by
+    " default).
+    let g:secure_modelines_allowed_items = ['ft', 'spl', 'fdm',
+                                          \ 'sw', 'sts', 'noet']
+
 " Settings for the NERD commenter.
     " Don't create any mappings I don't want to use.
     let g:NERDCreateDefaultMappings = 0
     " Map toggle comment.
-    map <Leader><Leader> <Plug>NERDCommenterToggle
+    nmap <Leader><Leader> <Plug>NERDCommenterToggle
 
 " XPTemplate settings.
     " Try to maintain snippet rendering even after editing outside of a
@@ -710,7 +729,7 @@ if has('autocmd')
                                  \ setlocal textwidth=72
 " Use the same comment string as for Vim files in Vimperator files.
         autocmd FileType vimperator setlocal commentstring=\"%s
-" Use tex compiler for (La)TeX files.
+" Use TeX compiler for (La)TeX files.
         autocmd FileType tex compiler tex
 
 " FTDETECT AUTO COMMANDS