" Vim main configuration file.
-" Copyright (C) 2008-2012 Simon Ruderich
+" Copyright (C) 2008-2013 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
" Save 'runtimepath' in case it was changed by the system's configuration
" 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.
+" automagically restored to the correct value. Not sure what exactly Vim is
+" doing there.
if has('eval')
let s:save_runtimepath = &runtimepath
let s:save_diff = &diff
set runtimepath-=~/.vim
set runtimepath^=~/.vim,~/.vim/runtime
-" Don't store swap files in the same directory as the edited file. But only if
+" Don't store swap files in the same directory as the edited file, but only if
" we have a "safe" writable directory available.
if filewritable('~/.tmp') == 2 || filewritable('~/tmp') == 2
set directory-=.
" started.
set formatoptions+=l
" Remove comment leader when joining lines where it makes sense.
-if <SID>HasVersionAndPatch(703, 541)
+if s:HasVersionAndPatch(703, 541)
set formatoptions+=j
endif
set spelllang=en_us
endif
-" Allow buffers with changes to be hidden. Very important for effective
+" Allow buffers with changes to be hidden. Very important for efficient
" editing with multiple buffers. Prevents the "E37: No write since last change
-" (add ! to override)" warning when switching buffers.
+" (add ! to override)" warning when switching modified buffers.
set hidden
" When splitting vertically put the new window right of the current one.
endif
endfunction
- " Display unexpected 'fileformat' and 'fileencoding' settings.
+ " Display unexpected 'fileformat', 'fileencoding' and 'bomb' settings.
function! s:StatuslineFileFormat()
if &fileformat != 'unix'
return '[' . &fileformat . ']'
return ''
endif
endfunction
+ function! s:StatuslineFileBOMB()
+ if exists('+bomb') && &bomb
+ return '[BOM]'
+ else
+ return ''
+ endif
+ endfunction
" Return current syntax group in brackets or nothing if there's none.
function! s:StatuslineSyntaxGroup()
" Short function names to make 'statusline' more readable.
function! SBC()
- return <SID>StatuslineBufferCount()
+ return s:StatuslineBufferCount()
endfunction
function! SRF()
- return <SID>StatuslineRelativeFilename()
+ return s:StatuslineRelativeFilename()
endfunction
function! SFF()
- return <SID>StatuslineFileFormat()
+ return s:StatuslineFileFormat()
endfunction
function! SFE()
- return <SID>StatuslineFileEncoding()
+ return s:StatuslineFileEncoding()
+ endfunction
+ function! SFB()
+ return s:StatuslineFileBOMB()
endfunction
function! SSG()
- return <SID>StatuslineSyntaxGroup()
+ return s:StatuslineSyntaxGroup()
endfunction
set statusline=
set statusline+=%#Error# " display warnings
set statusline+=%{SFF()} " - unexpected file format
set statusline+=%{SFE()} " - unexpected file encoding
+ set statusline+=%{SFB()} " - unexpected file byte order mask
set statusline+=%## " continue with normal colors
endif
" modified by a plugin or other settings. Except for <Nop> which isn't
" affected by mappings.
-" Easy way to exit insert mode. jk is preferred because it's faster.
-inoremap jj <Esc>
+" Easy way to exit insert mode (jj is too slow).
inoremap jk <Esc>
" Also for command mode, thanks to http://github.com/mitechie/pyvim
" (2010-10-15).
-cnoremap jj <C-C>
cnoremap jk <C-C>
+" And fix my typos ...
+inoremap JK <Esc>
+inoremap Jk <Esc>
+cnoremap JK <C-C>
+cnoremap Jk <C-C>
" Disable arrow keys for all modes except command modes. Thanks to James Vega
" (http://git.jamessan.com/?p=etc/vim.git;a=summary).
\ :call <SID>TemporaryNostartofline("<Bslash><Lt>C-U>")<CR>
endif
+" Let Y yank to the end of the line, similar to D and C. Use yy if you want to
+" yank a line. This fixes a weird inconsistency in Vi(m).
+nnoremap Y y$
+
" 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<CR>.
" Only the current buffer is written, thus switching to another buffer works
nnoremap <silent> <Leader>9 :9buffer<CR>
nnoremap <silent> <Leader>0 :10buffer<CR>
+" Use real tabs instead of soft tabs.
+if has('eval')
+" Switch from soft tabs to real tabs.
+ function! s:UseTabs()
+ setlocal noexpandtab shiftwidth=8 softtabstop=8
+ endfunction
+ nnoremap <silent> <Leader>t :call <SID>UseTabs()<CR>
+endif
+" Enable "verbatim" mode. Used to view files with long lines or without syntax
+" coloring.
+nnoremap <silent> <Leader>v :set nolist nowrap nospell synmaxcol=0<CR>
+ \ :2match<CR>
+
" Make last active window the only window. Similar to <C-W> o.
nnoremap <C-W>O <C-W>p<C-W>o
nmap <Leader>sd <Nop>
endif
-" Add semicolon to the end of the line. Thanks to
-" http://www.van-laarhoven.org/vim/.vimrc for this idea and godlygeek in #vim
-" on Freenode for an improved version which doesn't clobber any marks.
-nnoremap <silent> <Leader>; :call setline(line('.'), getline('.') . ';')<CR>
-
if has('eval')
" * and # for selections in visual mode. Thanks to
" http://got-ravings.blogspot.com/2008/07/vim-pr0n-visual-search-mappings.html
if !&diff && exists(':2match')
" Use ColorColumn for overlong lines if available and my color
" scheme is used.
- if &t_Co == 256 && <SID>HasSyntaxGroup('ColorColumn')
+ if &t_Co == 256 && s:HasSyntaxGroup('ColorColumn')
2match ColorColumn /\%>78v./
else
2match Todo /\%>78v./
" Special highlight for tabs to reduce their visibility in contrast to other
" SpecialKey characters (e.g. ^L).
- if &t_Co == 256 && <SID>HasSyntaxGroup('specialKeyTab')
+ if &t_Co == 256 && s:HasSyntaxGroup('specialKeyTab')
call matchadd('specialKeyTab', '\t')
endif
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 <SID>CustomSyntaxHighlights()
+ call s:CustomSyntaxHighlights()
if has('autocmd')
augroup vimrc
- autocmd WinEnter * call <SID>CustomSyntaxHighlights()
+ autocmd WinEnter * call s:CustomSyntaxHighlights()
augroup END
endif
" Don't manage the working directory (the default setting is too slow for
" me).
let g:ctrlp_working_path_mode = 0
+
" Path to cache directory. I prefer to keep generated files as local as
" possible.
let g:ctrlp_cache_dir = $HOME . '/.vim/cache/ctrlp'
- " Permanent cache, cleared by a crontab entry.
+ " Permanent cache, cleared by a crontab entry. Use <F5> to update the
+ " cache manually.
let g:ctrlp_clear_cache_on_exit = 0
+ " Don't switch the window if the selected buffer is already open. I want
+ " to open another view on this buffer in most cases.
+ let g:ctrlp_switch_buffer = 0
+
" FSWitch settings.
- " Default don't work well for my projects.
+ " Defaults don't work well for my projects.
augroup vimrc
autocmd BufEnter *.cc let b:fswitchdst = 'h'
\ | let b:fswitchlocs = './'
" Switch to corresponding header/source file.
nnoremap <silent> <Leader>h :FSHere<CR>
+
+" netrw settings.
+ " Don't create ~/.vim/.netrwhist history file.
+ let g:netrw_dirhistmax = 0
endif
" 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. InsertLeave
-" doesn't exist in older Vims.
+" doesn't exist in older Vims. Use "*p to paste X11's selection, no need for
+" 'paste' in this case.
if exists('##InsertLeave')
autocmd InsertLeave * set nopaste
endif
endif
" Display a warning when editing a file which contains "do not edit" (ignoring
-" the case, \c), for example template files which were preprocessed or
-" auto-generated files. Especially useful when the header is not displayed on
-" the first screen, e.g. when the old position is restored. Not for vimrc
-" though.
+" the case) and similar messages in the first lines of the file, for example
+" template files which were preprocessed or auto-generated files. Especially
+" useful when the header is not displayed on the first screen, e.g. when the
+" old position is restored.
function! s:SearchForDoNotEditHeader()
- if search('\cdo not edit', 'n') == 0
- \ || expand('<afile>:t') =~# '^.\?vimrc$'
+ " Only search the first 20 lines to prevent false positives, e.g.
+ " in scripts which write files containing this warning and ignore
+ " the case (\c). (Can't use search()'s {stopline} as we might not
+ " start searching from the top.)
+ let l:search = '\c\(do not \(edit\|modify\)\|autogenerated by\)'
+ let l:match = search(l:search, 'n')
+ if l:match == 0 || l:match > 20
return
endif
echoerr 'Do not edit this file! (Maybe a template file.)'
endfunction
- autocmd BufRead * call <SID>SearchForDoNotEditHeader()
+ autocmd BufRead * call s:SearchForDoNotEditHeader()
" AFTER/FTPLUGIN AUTO COMMANDS
" the recommendation for git commit messages (http://tpope.net/node/106).
autocmd FileType gitcommit let g:secure_modelines_allowed_items = [] |
\ setlocal textwidth=72
+" Fix 'include' setting for shell files to recognize '.' and 'source'
+" commands. Use &l:include instead of setlocal which requires excessive
+" escaping of \.
+ autocmd FileType sh let &l:include = '^\s*\(\.\|source\)\s\+'
" Use the same comment string as for Vim files in Vimperator files.
autocmd FileType vimperator setlocal commentstring=\"%s
" Use TeX compiler for (La)TeX files.
" 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.
+" for the diffed file as the filetype for the original file.
if !exists(':DiffOrig')
command DiffOrig
\ let s:diff_orig_filetype = &filetype
ruderich.org/simon / config / dotfiles.git / blobdiff