X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=386961cb5f2e5487dcacc5fdb89f37114e9d48f1;hb=28f65782f112ca952a9e068fbcc8677ef1dc4fbf;hp=61a07040859e69570e18317fbebad844f193040b;hpb=363bce2670cc10f255e49f640f5ca1927fe5ba36;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 61a0704..386961c 100644 --- a/vimrc +++ b/vimrc @@ -1,19 +1,40 @@ " Vim main configuration file. -" Make sure Vim (and not Vi) settings are enabled. +" EDITOR SETTINGS + +" Make sure Vim (and not Vi) settings are used. set nocompatible +" Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim +" runtime files). +set runtimepath-=~/.vim +set runtimepath^=~/.vim,~/.vim/runtime + +" Disable modelines as they may cause security problems. Instead use +" securemodelines (Vim script #1876). +set nomodeline + +" When completing paths first use the longest path then display a list of all +" possible files. +set wildmode=longest,list + +" Increase number of tabs which can be opened with the -p option. +if v:version >= 700 + set tabpagemax=50 +endif + " EDIT SETTINGS " Enable automatic file detection, plugin and indention. -if has("autocmd") +if has('autocmd') filetype plugin indent on endif -" Use UTF-8 file encoding for all files. -set fileencodings=utf-8 +" Use UTF-8 file encoding for all files. Automatically recognize latin1 in +" existing files. +set fileencodings=utf-8,latin1 " Wrap text after 78 characters. set textwidth=78 @@ -48,26 +69,31 @@ set formatoptions+=l set virtualedit=block " Already display matches while typing the search command. This makes spotting -" errors easily. +" errors easy. set incsearch " Activate syntax folding. -if has("folding") +if has('folding') set foldmethod=syntax set foldcolumn=2 - set foldlevel=99 " no folding at default + set foldlevel=99 " no closed folds at default, 'foldenable' would disable + " folding which is not what I want endif " Only check for case if the searched word contains a capital character. set ignorecase set smartcase -" Activate spell checking, use English as default. -if v:version >= 700 +" Activate spell checking, use English as default. Don't use spell checking +" when diffing. +if v:version >= 700 && !&diff set spell set spelllang=en_us endif +" Allow buffers with changes to be hidden. +set hidden + " DISPLAY SETTINGS @@ -86,42 +112,40 @@ if v:version >= 700 set cursorline endif -" Display tabs as "^I" and trailing space as "-". +" Display tabs, trailing space, non breakable spaces and long lines (when +" wrapping is enabled). set list -set listchars=trail:- - - -" EDITOR SETTINGS - -" When completing paths first use the longest path then display a list of all -" possible files. -set wildmode=longest,list - -" Increase number of tabs which can be opened with the -p option. -if v:version >= 700 - set tabpagemax=50 -endif +set listchars=trail:-,nbsp:!,extends:> " MAPPINGS (except for plugins, see PLUGIN SETTINGS below) -" Use "," as my mapleader. -if has("eval") - let mapleader = "," - let maplocalleader = "," -endif - " Use to move down a page and - to move up one like in mutt. nnoremap nnoremap - -" Maps to change spell language between English and German. -map se :set spelllang=en_us -map sd :set spelllang=de_de +" 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 + +" Maps to change spell language between English and German and disable it. +if v:version >= 700 + map sn :set nospell + map se :set spell spelllang=en_us + map sd :set spell spelllang=de_de +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 -" for an improved version which doesn't clobber any marks. +" on Freenode for an improved version which doesn't clobber any marks. nnoremap ; :call setline(line('.'), getline('.') . ';') " I often type "W" instead of "w" when trying to save a file. Fix my mistake. @@ -130,28 +154,36 @@ nnoremap ; :call setline(line('.'), getline('.') . ';') if v:version < 700 cnoreabbrev W w cnoreabbrev Wq wq + cnoreabbrev Wqa wqa else cnoreabbrev W \ ((getcmdtype() == ':' && getcmdpos() <= 2) ? 'w' : 'W') cnoreabbrev Wq \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'wq' : 'Wq') + cnoreabbrev Wqa + \ ((getcmdtype() == ':' && getcmdpos() <= 4) ? 'wqa' : 'Wqa') endif " Also fix my typo with "Q". if v:version < 700 cnoreabbrev Q q + cnoreabbrev Qa qa else cnoreabbrev Q \ ((getcmdtype() == ':' && getcmdpos() <= 2) ? 'q' : 'Q') + cnoreabbrev Qa + \ ((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 sometimes). -if has("mac") - imap +" 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") && has("eval") +if has('gui_macvim') && has('eval') let macvim_skip_cmd_opt_movement = 1 endif @@ -159,7 +191,7 @@ endif " SYNTAX SETTINGS " Activate syntax coloring. -if has("syntax") +if has('syntax') syntax enable " Highlight text longer then 78 characters. Thanks to Tony Mechelynck @@ -169,6 +201,11 @@ if has("syntax") else match Todo /\%>78v./ endif + +" Highlight TODO, FIXME, CHANGED and XXX in all documents. + if v:version >= 701 && has('patch40') + call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)') + endif endif @@ -176,7 +213,7 @@ endif " Settings for the NERD commenter. " Don't create any mappings I don't want to use. -if has("eval") +if has('eval') let NERDCreateDefaultMappings = 0 endif " Map toggle comment. @@ -187,10 +224,44 @@ map NERDCommenterToggle " Use a custom auto group to prevent problems when the vimrc files is sourced " twice. -if has("autocmd") +if has('autocmd') augroup vimrc autocmd! +" Go to last position of opened files. Taken from :help last-position-jump. + autocmd BufReadPost * + \ if line("'\"") > 1 && line("'\"") <= line("$") | + \ execute "normal! g'\"" | + \ endif + +" AFTER/FTPLUGIN AUTO COMMANDS + +" Disable spell checking for files which don't need it. + autocmd FileType deb setlocal nospell + autocmd FileType diff setlocal nospell + autocmd FileType tar setlocal nospell +" Fix to allow Vim edit crontab files as crontab doesn't work with +" backupcopy=auto. + autocmd FileType crontab setlocal backupcopy=yes +" Don't use the modeline as the diff created by `git commit -v` may contain +" one which could change the filetype or other settings of the commit window. + autocmd FileType gitcommit setlocal nomodeline | + \ let g:secure_modelines_allowed_items = [] +" Allow folding. + autocmd FileType perl let perl_fold = 1 | + \ let perl_fold_blocks = 1 +" Use the same comment string as for Vim files. + autocmd FileType vimperator setlocal commentstring=\"%s + +" FTDETECT AUTO COMMANDS + +" Recognize .md as markdown files. + autocmd BufRead,BufNewFile *.md set filetype=mkd +" Recognize .test as Tcl files. + autocmd BufRead,BufNewFile *.test set filetype=tcl + +" OTHER AUTO COMMANDS + " Use diff filetype for mercurial patches in patch queue. autocmd BufReadPost */.hg/patches/* set filetype=diff