X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=28803a1330197303f73ec91747ed7ea8688ef231;hb=4caa8a862f391d16f905ee1c286495d82b0879e6;hp=6516546234febcfcfa372f56827426d8cc30d28a;hpb=c0f0674fa5247d4bc444e684f29e1a2ab68be65f;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 6516546..28803a1 100644 --- a/vimrc +++ b/vimrc @@ -25,6 +25,10 @@ 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) if available. set runtimepath-=~/.vim @@ -218,7 +222,7 @@ 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 @@ -273,10 +277,10 @@ nnoremap ; :call setline(line('.'), getline('.') . ';') " and all nerds involved (godlygeek, strull in #vim on Freenode). if has('eval') function! s:VSetSearch() - let temp = @@ + let l:temp = @@ normal! gvy let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g') - let @@ = temp + let @@ = l:temp endfunction vnoremap * :call VSetSearch()// vnoremap # :call VSetSearch()?? @@ -311,24 +315,11 @@ else \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'qa' : 'Qa') endif -" Make sure xa0 (alt + space) is automatically changed to a normal whitespace -" if pressed accidentally while in insert mode (happens on Mac when alt -" doesn't send escape). filereadable() is necessary for Leopard were 'mac' is -" no longer set on the console. -if has('mac') || filereadable('/Users/.localized') - inoremap -endif - -" Disable Apple style movements in MacVim. -if has('gui_macvim') - let g:macvim_skip_cmd_opt_movement = 1 -endif - " In case 'hlsearch' is used disable it with . Thanks to frogonwheels and " vimgor (bot) in #vim on Freenode (2010-03-30 05:58 CEST). noremap :nohlsearch -" Ctrl-U in insert mode deletes a lot, break undo sequence before deleting the +" 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 @@ -339,6 +330,50 @@ 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 @@ -371,16 +406,16 @@ if has('syntax') if exists('*matchadd') " Highlight some important keywords in all documents. - for x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED'] - call matchadd('Todo', x) + for s:x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED'] + call matchadd('Todo', s:x) endfor " Highlight unicode whitespace which is no normal whitespace (0x20). - for x in ['00a0', '1680', '180e', '2000', '2001', '2002', '2003', + for s:x in ['00a0', '1680', '180e', '2000', '2001', '2002', '2003', \ '2004', '2005', '2006', '2007', '2008', '2009', '200a', \ '200b', '200c', '200d', '202f', '205f', '2060', '3000', \ 'feff'] - call matchadd('Error', '\%u' . x) + call matchadd('Error', '\%u' . s:x) endfor endif @@ -411,7 +446,7 @@ if has('eval') " Settings for the NERD commenter. " Don't create any mappings I don't want to use. - let NERDCreateDefaultMappings = 0 + let g:NERDCreateDefaultMappings = 0 " Map toggle comment. map NERDCommenterToggle @@ -507,48 +542,6 @@ endif " 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