X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=7aa91ce35c6687d787652ba4ab377e50ca176d33;hb=72d0d497216e677adcde06379e88ca0143ddf2e5;hp=92946926b425c70308aa2105be2cb36221a56c28;hpb=3fb48422ab22ba6c60c7db059c1f3cbb77b94142;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 9294692..7aa91ce 100644 --- a/vimrc +++ b/vimrc @@ -3,18 +3,13 @@ " EDITOR SETTINGS -" Prevent editing as root as it may cause security problems. Use sudoedit -" instead. Thanks to godlygeek in #vim on Freenode (2009-06-19 22:21 CEST). -if $HOME == '/root' || exists('$SUDO_USER') - echomsg 'Running as root is forbidden! Use sudoedit.' - qall -endif - - " Save 'runtimepath' in case it was changed by the system's configuration -" files. +" files. Also save 'diff' as set all& resets it; but somehow later (after +" sourcing the vimrc - for example in a VimEnter autocmd) it gets +" automagically restored to the correct value. if has('eval') let s:save_runtimepath = &runtimepath + let s:save_diff = &diff endif " Reset all options (except 'term', 'lines' and 'columns'). This makes sure a " system wide configuration file doesn't change default values. @@ -22,7 +17,9 @@ set all& " And restore it after all other options were reset. if has('eval') let &runtimepath = s:save_runtimepath + let &diff = s:save_diff unlet s:save_runtimepath + unlet s:save_diff endif " Make sure Vim (and not Vi) settings are used. @@ -119,10 +116,12 @@ endif set ignorecase set smartcase -" Activate spell checking, use English as default. Don't use spell checking -" when diffing. -if exists('+spell') && has('syntax') && !&diff - set spell +" Activate spell checking, use English as default. +if exists('+spell') && has('syntax') + " But not when diffing as spell checking is distracting in this case. + if !&diff + set spell + endif set spelllang=en_us endif @@ -225,8 +224,8 @@ cnoremap cnoremap " Write before suspending, thanks to deryni in #vim on Freenode (2011-05-09 -" 20:02 CEST). To suspend without saving either unmap it or use :stop. -nnoremap :update:stop +" 20:02 CEST). To suspend without saving either unmap this or use :stop. +nnoremap :update:stop " 2 gives more verbose information, use it by default. Thanks to NCS_One " in #vim on Freenode (2011-08-15 00:17 CEST). @@ -242,26 +241,26 @@ nnoremap gb :bnext nnoremap gB :bprev " Fast access to buffers. -nnoremap 1 :1b -nnoremap 2 :2b -nnoremap 3 :3b -nnoremap 4 :4b -nnoremap 5 :5b -nnoremap 6 :6b -nnoremap 7 :7b -nnoremap 8 :8b -nnoremap 9 :9b -nnoremap 0 :10b - -" Make last active window the only window. Similar to o. +nnoremap 1 :1b +nnoremap 2 :2b +nnoremap 3 :3b +nnoremap 4 :4b +nnoremap 5 :5b +nnoremap 6 :6b +nnoremap 7 :7b +nnoremap 8 :8b +nnoremap 9 :9b +nnoremap 0 :10b + +" Make last active window the only window. Similar to o. nnoremap O po " Maps to change spell language between English and German and disable spell " checking. if exists('+spell') - noremap sn :set nospell - noremap se :set spell spelllang=en_us - noremap sd :set spell spelllang=de_de + noremap sn :set nospell + noremap se :set spell spelllang=en_us + noremap sd :set spell spelllang=de_de endif " Add semicolon to the end of the line. Thanks to @@ -321,7 +320,7 @@ if has('mac') || filereadable('/Users/.localized') endif " Disable Apple style movements in MacVim. -if has('gui_macvim') && has('eval') +if has('gui_macvim') let g:macvim_skip_cmd_opt_movement = 1 endif @@ -376,34 +375,36 @@ if has('syntax') " Settings for specific filetypes. + " Haskell. + let g:hs_highlight_boolean = 1 + let g:hs_highlight_types = 1 + let g:hs_highlight_more_types = 1 + " Perl. let g:perl_fold = 1 let g:perl_fold_blocks = 1 let g:perl_nofold_packages = 1 let g:perl_include_pod = 1 " syntax coloring for PODs - endif " PLUGIN SETTINGS +if has('eval') " Use pathogen which allows one 'runtimepath' entry per plugin. This makes " installing/removing/updating plugins simple. (Used for plugins with more " than one file.) -if has('eval') && v:version >= 700 - execute 'call pathogen#runtime_append_all_bundles()' -endif + if v:version >= 700 + execute 'call pathogen#runtime_append_all_bundles()' + endif " Settings for the NERD commenter. -" Don't create any mappings I don't want to use. -if has('eval') - let g:NERDCreateDefaultMappings = 0 -endif -" Map toggle comment. -map NERDCommenterToggle + " Don't create any mappings I don't want to use. + let NERDCreateDefaultMappings = 0 + " Map toggle comment. + map NERDCommenterToggle " XPTemplate settings. -if has('eval') " Try to maintain snippet rendering even after editing outside of a " snippet. let g:xptemplate_strict = 0 @@ -492,17 +493,16 @@ if has('autocmd') endif -" CUSTOM FUNCTIONS +" CUSTOM FUNCTIONS AND COMMANDS if has('eval') - " New text-objects ii and ai to work on text with the same indentation. - " Thanks to - " http://vim.wikia.com/index.php?title=Indent_text_object&oldid=27126 - " (visited on 2011-11-19). - onoremap ai :call IndTxtObj(0) - onoremap ii :call IndTxtObj(1) - vnoremap ai :call IndTxtObj(0)gv - vnoremap ii :call IndTxtObj(1)gv +" New text-objects ii and ai to work on text with the same indentation. Thanks +" to http://vim.wikia.com/index.php?title=Indent_text_object&oldid=27126 +" (visited on 2011-11-19). + onoremap ai :call IndTxtObj(0) + onoremap ii :call IndTxtObj(1) + vnoremap ai :call IndTxtObj(0)gv + vnoremap ii :call IndTxtObj(1)gv function! s:IndTxtObj(inner) let curline = line(".") @@ -538,4 +538,21 @@ if has('eval') endif endfunction +" Convenient command to see the difference between the current buffer and the +" file it was loaded from, thus the changes you made. Thanks to the +" vimrc_example.vim file in Vim's source. Modified to use the same filetype +" for the diffed file than the filetype for the original file. + if !exists(":DiffOrig") + command DiffOrig + \ let s:diff_orig_filetype = &filetype + \ | vertical new + \ | let &filetype = s:diff_orig_filetype + \ | unlet s:diff_orig_filetype + \ | set buftype=nofile + \ | read ++edit # + \ | 0d_ + \ | diffthis + \ | wincmd p + \ | diffthis + endif endif