X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=623b60fd837d51ecf7f285f80c6e8ab9af193099;hb=9f40ae3e21a135bcd8abe16b5d5073d22f523057;hp=87724343ab8db6aabc870b759245d3bb8b61b9bc;hpb=15c46ed109a9cdceee55fe1dcdc0b5b15bc5ab46;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 8772434..623b60f 100644 --- a/vimrc +++ b/vimrc @@ -1,6 +1,6 @@ " Vim main configuration file. -" Copyright (C) 2011-2012 Simon Ruderich +" 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 @@ -51,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 @@ -139,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 @@ -150,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 @@ -190,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 @@ -284,6 +298,33 @@ cmap 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 @@ -292,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. @@ -336,7 +378,9 @@ if has('eval') function! s:VSetSearch() let l:temp = @@ normal! gvy - let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g') + " 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()// @@ -463,28 +507,53 @@ if has('syntax') 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 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 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' . s: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. @@ -501,6 +570,10 @@ if has('syntax') 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) @@ -514,9 +587,9 @@ 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. @@ -576,6 +649,15 @@ if has('autocmd') 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 " Disable spell checking for files which don't need it.