X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=623b60fd837d51ecf7f285f80c6e8ab9af193099;hb=9f40ae3e21a135bcd8abe16b5d5073d22f523057;hp=0e5545176a00a696a5d8894a11a11d70d708a71c;hpb=50b88549656631a03dbdf36e086ac7087a7ffa5e;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 0e55451..623b60f 100644 --- a/vimrc +++ b/vimrc @@ -1,5 +1,20 @@ " Vim main configuration file. +" Copyright (C) 2008-2012 Simon Ruderich +" +" This file is free software: you can redistribute it and/or modify +" it under the terms of the GNU General Public License as published by +" the Free Software Foundation, either version 3 of the License, or +" (at your option) any later version. +" +" This file is distributed in the hope that it will be useful, +" but WITHOUT ANY WARRANTY; without even the implied warranty of +" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +" GNU General Public License for more details. +" +" You should have received a copy of the GNU General Public License +" along with this file. If not, see . + " EDITOR SETTINGS @@ -25,6 +40,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 @@ -32,7 +51,7 @@ set runtimepath^=~/.vim,~/.vim/runtime " Don't store swap files in the same directory as the edited file. set directory-=. -" But store them in ~/.tmp if available. +" But store them in ~/.tmp or ~/tmp (already set by default) if available. set directory^=~/.tmp " Disable modelines as they may cause security problems. Instead use @@ -50,11 +69,24 @@ set history=1000 " Increase number of possible undos. set undolevels=1000 +if has('viminfo') + " Remember marks (including the last cursor position) for more files. + set viminfo^='1000 +endif + " Use strong encryption if possible, also used for swap/undo files. if exists('+cryptmethod') set cryptmethod=blowfish endif +" Clear all vimrc-related autocmds. Has to be done here as the vimrc augroup +" is used multiple times. +if has('autocmd') + augroup vimrc + autocmd! + augroup END +endif + " EDIT SETTINGS @@ -107,7 +139,11 @@ set incsearch " Activate syntax folding. if has('folding') set foldmethod=syntax - set foldcolumn=2 + " Only use fold column if we have enough space (for example in a (virtual) + " terminals). + if &columns > 80 + set foldcolumn=2 + endif set foldlevel=99 " no closed folds at default, 'foldenable' would disable " folding which is not what I want endif @@ -118,7 +154,7 @@ set smartcase " Activate spell checking, use English as default. if exists('+spell') && has('syntax') - " But not when diffing as spell checking is distracting in this case. + " But not when diffing because spell checking is distracting in this case. if !&diff set spell endif @@ -158,10 +194,20 @@ if exists('+cursorline') set cursorline endif -" Display tabs, trailing space, non breakable spaces and long lines (when -" wrapping is disabled). +" Highlight all matches on the screen when searching. Use (see below) to +" remove the highlighting until the next search. +set hlsearch + +" Display some special characters. set list -set listchars=trail:-,extends:> +set listchars= +" Display tabs as ">--------". +set listchars+=tab:>- +" Display trailing whitespace as "-". +set listchars+=trail:- +" Display markers for long lines when wrapping is disabled. +set listchars+=extends:>,precedes:< +" Display non-breakable space as "!". if v:version >= 700 set listchars+=nbsp:! endif @@ -170,9 +216,34 @@ if has('statusline') " Always display the status line even if there is only one window. set laststatus=2 + " If there's more than one buffer return "/" (e.g. "/05") where + " is the highest buffer number, otherwise return nothing. Used in + " 'statusline' to get an overview of available buffer numbers. + function! StatuslineBufferCount() + let l:bufnr = bufnr('$') + if l:bufnr > 1 + let l:result = '/' + if exists('*printf') + let l:result .= printf('%02d', l:bufnr) + else + " Older Vims don't have printf() (and no .= either). Emulate + " "%02d". + if l:bufnr < 10 + let l:result = l:result . '0' + endif + let l:result = l:result . l:bufnr + endif + return l:result + else + return '' + endif + endfunction + set statusline= " on the left - set statusline+=%02n: " buffer number + set statusline+=%02n " buffer number + set statusline+=%{StatuslineBufferCount()} " highest buffer number + set statusline+=: set statusline+=%f\ " path to current file in buffer set statusline+=%h " [help] if buffer is help file set statusline+=%w " [Preview] if buffer is preview buffer @@ -193,6 +264,10 @@ endif " MAPPINGS (except for plugins, see PLUGIN SETTINGS below) +" noremap is used to make sure the right side is executed as is and can't be +" modified by a plugin or other settings. Except for which isn't +" affected by mappings. + " Easy way to exit insert mode. inoremap jj inoremap jk @@ -218,11 +293,38 @@ 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 +if has('eval') +" Don't move the cursor to the first column for certain scroll commands (, , ). Thanks to jamessan in #vim on Freenode (2011-08-31 +" 02:27 CEST) for the 'nostartofline' tip. But I can't use 'nostartofline' +" directly because it also enables that feature for other commands which I +" don't want. + + " Set 'nostartofline' for a single movement. + function! s:TemporaryNostartofline(movement) + let l:startofline = &startofline + set nostartofline + execute 'normal! ' . a:movement + let &startofline = l:startofline + endfunction + + " Thanks to fow in #vim on Freenode (2012-02-16 15:38 CET) for the idea to + " use ""; Vim documentation reference: :help <>. + nnoremap + \ :call TemporaryNostartofline("C-F>") + nnoremap + \ :call TemporaryNostartofline("C-B>") + nnoremap + \ :call TemporaryNostartofline("C-D>") + nnoremap + \ :call TemporaryNostartofline("C-U>") +endif + " 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 @@ -231,9 +333,10 @@ nnoremap :update:stop " in #vim on Freenode (2011-08-15 00:17 CEST). nnoremap 2 -" Use to move down a page and - to move up one like in mutt. -nnoremap -nnoremap - +" Use to move down a page and - to move up one like in mutt. Don't use +" nnoremap so the / 'nostartofline' fix (see above) works. +nmap +nmap - " Go to next and previous buffer. Thanks to elik in #vim on Freenode " (2010-05-16 18:38 CEST) for this idea. @@ -241,16 +344,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 :1buffer +nnoremap 2 :2buffer +nnoremap 3 :3buffer +nnoremap 4 :4buffer +nnoremap 5 :5buffer +nnoremap 6 :6buffer +nnoremap 7 :7buffer +nnoremap 8 :8buffer +nnoremap 9 :9buffer +nnoremap 0 :10buffer " Make last active window the only window. Similar to o. nnoremap O po @@ -258,9 +361,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 + nnoremap sn :set nospell + nnoremap se :set spell spelllang=en_us + nnoremap sd :set spell spelllang=de_de endif " Add semicolon to the end of the line. Thanks to @@ -273,10 +376,12 @@ 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 + " Added \C to force 'noignorecase' while searching the current visual + " selection. I want to search for the exact string in this case. + let @/ = '\C' . '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g') + let @@ = l:temp endfunction vnoremap * :call VSetSearch()// vnoremap # :call VSetSearch()?? @@ -311,23 +416,65 @@ 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 +" 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 @@ -349,42 +496,89 @@ if has('syntax') set synmaxcol=500 endif +" Use (limited) syntax based omni completion if no other omni completion is +" available. Taken from :help ft-syntax-omni. + if has('autocmd') && exists('+omnifunc') + augroup vimrc + autocmd FileType * + \ if &omnifunc == '' | + \ setlocal omnifunc=syntaxcomplete#Complete | + \ endif + augroup END + endif + +" Function to enable all custom highlights. Necessary as highlights are +" window-local and thus must be set for each new window. + function! s:CustomSyntaxHighlights() + " Not the first time called, nothing to do. + if exists('w:vimrc_syntax_run') + return + endif + let w:vimrc_syntax_run = 1 + " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck " from the Vim mailing list. It can easily be " disabled when necessary with :2match (in Vim >= 700). - if exists(':2match') - 2match Todo /\%>78v./ - else - match Todo /\%>78v./ - endif + if exists(':2match') + 2match Todo /\%>78v./ + else + match Todo /\%>78v./ + endif - if exists('*matchadd') + if exists('*matchadd') " Highlight some important keywords in all documents. - for x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED'] - call matchadd('Todo', x) - endfor - -" Highlight unicode whitespace which is no normal whitespace (0x20). - for 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) - endfor + let l:todos = ['TODO', 'XXX', 'FIXME', + \ 'CHANGED', 'REMOVED', 'DELETED'] + " Compatibility fix for Vim 6.4 which can't handle for in function + " (without function it's ignored). + execute ' for l:x in l:todos' + \ '| call matchadd("Todo", l:x)' + \ '| endfor' + +" Highlight Unicode whitespace which is no normal whitespace (0x20). + let l:spaces = ['00a0', '1680', '180e', '2000', '2001', '2002', + \ '2003', '2004', '2005', '2006', '2007', '2008', + \ '2009', '200a', '200b', '200c', '200d', '202f', + \ '205f', '2060', '3000', 'feff'] + " Compatibility fix for Vim 6.4. Escape \ inside the " string or + " it won't work! + execute ' for l:x in l:spaces' + \ '| call matchadd("Error", "\\%u" . l:x)' + \ '| endfor' + endif + endfunction +" Enable highlights for the current and all new windows. Thanks to bairui in +" #vim on Freenode (2012-04-01 00:22 CEST) for the WinEnter suggestion. + call CustomSyntaxHighlights() + if has('autocmd') + augroup vimrc + autocmd WinEnter * call CustomSyntaxHighlights() + augroup END endif " Settings for specific filetypes. " Haskell. + let g:hs_highlight_delimiters = 1 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 + " Python. + let g:python_highlight_all = 1 + " Shell. + let g:sh_noisk = 1 " don't add . to 'iskeyword' + let g:sh_is_posix = 1 " POSIX shell (e.g. dash) is compatible enough + let g:sh_fold_enabled = 7 " functions (1), heredoc (2) and if/do/for (4) + " Vim. + let g:vimsyn_embed = 0 " don't highlight embedded languages + let g:vimsyn_folding = 'af' " folding for autogroups (a) and functions (f) + " XML. + let g:xml_syntax_folding = 1 endif @@ -393,14 +587,14 @@ endif 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.) +" than one file.) Ignore errors in case pathogen is not installed. if v:version >= 700 - execute 'call pathogen#runtime_append_all_bundles()' + silent! execute 'call pathogen#runtime_append_all_bundles()' endif " 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 @@ -421,12 +615,10 @@ endif " twice. if has('autocmd') augroup vimrc -" Remove all autocmds from the current group. - autocmd! " Go to last position of opened files. Taken from :help last-position-jump. autocmd BufReadPost * - \ if line("'\"") > 1 && line("'\"") <= line("$") | + \ if line("'\"") > 1 && line("'\"") <= line('$') | \ execute "normal! g'\"" | \ endif " But not for Git commits, go to beginning of the file. @@ -445,13 +637,26 @@ if has('autocmd') " Automatically disable 'paste' mode when leaving insert mode. Thanks to " Raimondi in #vim on Freenode (2010-08-14 23:01 CEST). Very useful as I only -" want to paste once and then 'paste' gets automatically unset. +" want to paste once and then 'paste' gets automatically unset. InsertLeave +" doesn't exist in older Vims. if exists('##InsertLeave') autocmd InsertLeave * set nopaste endif -" Write file when running :mak[e] before 'makeprg' is called. - autocmd QuickFixCmdPre * write +" Write file when running :mak[e] before 'makeprg' is called. QuickFixCmdPre +" doesn't exist in older Vims. + if exists('##QuickFixCmdPre') + autocmd QuickFixCmdPre * write + endif + +" Don't ignore case while in insert mode, but ignore case in all other modes. +" This causes / to honor the case and thus only complete matching +" capitalization. But while searching (/) 'ignorecase' is used. +" InsertEnter/InsertLeave doesn't exist in older Vims. + if exists('##InsertEnter') && exists('##InsertLeave') + autocmd InsertEnter * set noignorecase + autocmd InsertLeave * set ignorecase + endif " AFTER/FTPLUGIN AUTO COMMANDS @@ -496,53 +701,11 @@ 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 " for the diffed file than the filetype for the original file. - if !exists(":DiffOrig") + if !exists(':DiffOrig') command DiffOrig \ let s:diff_orig_filetype = &filetype \ | vertical new