X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=bf94896e63485c3890fff7a26eb902392222bac9;hb=669c65e2be773dc0138879774637b2a6830b2ca6;hp=c3a85eb20042b900e658becc8ca0d7e0b2e71469;hpb=b122832efa953ed888415f7a3959d4cbeae6e265;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index c3a85eb..bf94896 100644 --- a/vimrc +++ b/vimrc @@ -4,9 +4,12 @@ " EDITOR SETTINGS " 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. @@ -14,14 +17,20 @@ 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. set nocompatible +" Use UTF-8 for all internal data (buffers, registers, etc.). This doesn't +" affect reading files in different encodings, see 'fileencodings' for that. +set encoding=utf-8 + " Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim -" runtime files). +" runtime files) if available. set runtimepath-=~/.vim set runtimepath^=~/.vim,~/.vim/runtime @@ -111,10 +120,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 @@ -211,14 +222,14 @@ cmap cmap cmap -" Use Ctrl-P/Ctrl-N as replacement for / in command mode. Thanks to +" Use / as replacement for / in command mode. Thanks to " abstrakt and grayw in #vim on Freenode (2010-04-12 21:20 CEST). cnoremap cnoremap " Write before suspending, thanks to deryni in #vim on Freenode (2011-05-09 " 20:02 CEST). To suspend without saving either unmap this or use :stop. -nnoremap :update: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). @@ -234,16 +245,16 @@ 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 +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 @@ -251,9 +262,9 @@ 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,6 +332,61 @@ endif " vimgor (bot) in #vim on Freenode (2010-03-30 05:58 CEST). noremap :nohlsearch +" in insert mode deletes a lot, break undo sequence before deleting the +" line so the change can be undone. Thanks to the vimrc_example.vim file in +" Vim's source. +inoremap u +" Same for (insert previously inserted text and leave insert mode). +inoremap u +" And for (insert previously inserted text). +inoremap u +" And for (delete word before cursor). +inoremap u + +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 + + function! s:IndTxtObj(inner) + let curline = line(".") + let lastline = line("$") + let i = indent(line(".")) - &shiftwidth * (v:count1 - 1) + let i = i < 0 ? 0 : i + if getline(".") !~ "^\\s*$" + let p = line(".") - 1 + let nextblank = getline(p) =~ "^\\s*$" + while p > 0 + \ && ((i == 0 && !nextblank) + \ || (i > 0 && ((indent(p) >= i + \ && !(nextblank && a:inner)) + \ || (nextblank && !a:inner)))) + - + let p = line(".") - 1 + let nextblank = getline(p) =~ "^\\s*$" + endwhile + normal! 0V + call cursor(curline, 0) + let p = line(".") + 1 + let nextblank = getline(p) =~ "^\\s*$" + while p <= lastline + \ && ((i == 0 && !nextblank) + \ || (i > 0 && ((indent(p) >= i + \ && !(nextblank && a:inner)) + \ || (nextblank && !a:inner)))) + + + let p = line(".") + 1 + let nextblank = getline(p) =~ "^\\s*$" + endwhile + normal! $ + endif + endfunction +endif + " ABBREVIATIONS @@ -383,23 +449,21 @@ 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 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 @@ -445,7 +509,7 @@ if has('autocmd') autocmd InsertLeave * set nopaste endif -" Save changes when running :mak[e] before 'makeprg' is called. +" Write file when running :mak[e] before 'makeprg' is called. autocmd QuickFixCmdPre * write " AFTER/FTPLUGIN AUTO COMMANDS @@ -488,50 +552,24 @@ 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 - - function! s:IndTxtObj(inner) - let curline = line(".") - let lastline = line("$") - let i = indent(line(".")) - &shiftwidth * (v:count1 - 1) - let i = i < 0 ? 0 : i - if getline(".") !~ "^\\s*$" - let p = line(".") - 1 - let nextblank = getline(p) =~ "^\\s*$" - while p > 0 - \ && ((i == 0 && !nextblank) - \ || (i > 0 && ((indent(p) >= i - \ && !(nextblank && a:inner)) - \ || (nextblank && !a:inner)))) - - - let p = line(".") - 1 - let nextblank = getline(p) =~ "^\\s*$" - endwhile - normal! 0V - call cursor(curline, 0) - let p = line(".") + 1 - let nextblank = getline(p) =~ "^\\s*$" - while p <= lastline - \ && ((i == 0 && !nextblank) - \ || (i > 0 && ((indent(p) >= i - \ && !(nextblank && a:inner)) - \ || (nextblank && !a:inner)))) - + - let p = line(".") + 1 - let nextblank = getline(p) =~ "^\\s*$" - endwhile - normal! $ - 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