X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=040dad1286c37be94e92062ea81ef471b6e034da;hb=6a44ab1cf2b37c6954e53b9336a76f6e1ac26130;hp=644b59c1ac9aa2fe93f40dea0dda31842b9b915f;hpb=2f291940dcca8ae31d4c5c523ad254e75169f56f;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 644b59c..040dad1 100644 --- a/vimrc +++ b/vimrc @@ -3,13 +3,13 @@ " EDITOR SETTINGS -" Make sure Vim (and not Vi) settings are enabled. +" Make sure Vim (and not Vi) settings are used. set nocompatible -" Load my scripts from ~/.vim (my scripts), ~/.vim/plugins (plugins) and -" ~/.vim/runtime (checkout of Vim runtime files). +" Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim +" runtime files). set runtimepath-=~/.vim -set runtimepath^=~/.vim,~/.vim/plugins,~/.vim/runtime +set runtimepath^=~/.vim,~/.vim/runtime " Disable modelines as they may cause security problems. Instead use " securemodelines (Vim script #1876). @@ -19,21 +19,17 @@ set nomodeline " 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") +" Enable automatic file detection, plugin and indention support. +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 @@ -42,7 +38,7 @@ set textwidth=78 set shiftwidth=4 set softtabstop=4 set expandtab -" When < and > is used indent/deindent to the next shiftwidth boundary. +" When < and > is used indent/deindent to the next 'shiftwidth' boundary. set shiftround " Use the default value for real tabs. set tabstop=8 @@ -68,11 +64,11 @@ 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 closed folds at default, 'foldenable' would disable @@ -83,22 +79,25 @@ endif 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 && has('syntax') && !&diff set spell set spelllang=en_us endif -" Allow buffers with changes to be hidden. +" Allow buffers with changes to be hidden. Very important for effective +" editing with multiple buffers. set hidden " DISPLAY SETTINGS -" Use a dark background. +" Use a dark background. Doesn't change the background color, only sets text +" colors for a dark terminal. set background=dark -" Activate lines display. +" Display line numbers. set number " Display the ruler with current line/file position. set ruler @@ -113,7 +112,15 @@ endif " Display tabs, trailing space, non breakable spaces and long lines (when " wrapping is enabled). set list -set listchars=trail:-,nbsp:!,extends:> +set listchars=trail:-,extends:> +if v:version >= 700 + set listchars+=nbsp:! +endif + +" Always display the status line even if there is only one window. +if has('statusline') + set laststatus=2 +endif " MAPPINGS (except for plugins, see PLUGIN SETTINGS below) @@ -134,7 +141,11 @@ nnoremap 8 :8b nnoremap 9 :9b nnoremap 0 :10b -" Maps to change spell language between English and German and disable it. +" Make last active window the only window. Similar to o. +nnoremap O po + +" Maps to change spell language between English and German and disable spell +" checking. if v:version >= 700 map sn :set nospell map se :set spell spelllang=en_us @@ -144,18 +155,21 @@ 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 ; :call setline(line('.'), getline('.') . ';') +nnoremap ; :call setline(line('.'), getline('.') . ';') " I often type "W" instead of "w" when trying to save a file. Fix my mistake. " Thanks to Tony Mechelynck from the Vim " mailing list for the commands. if v:version < 700 cnoreabbrev W w + cnoreabbrev Wa wa cnoreabbrev Wq wq cnoreabbrev Wqa wqa else cnoreabbrev W \ ((getcmdtype() == ':' && getcmdpos() <= 2) ? 'w' : 'W') + cnoreabbrev Wa + \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'wa' : 'Wa') cnoreabbrev Wq \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'wq' : 'Wq') cnoreabbrev Wqa @@ -173,13 +187,15 @@ else 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 @@ -187,16 +203,22 @@ endif " SYNTAX SETTINGS " Activate syntax coloring. -if has("syntax") +if has('syntax') syntax enable -" Highlight text longer then 78 characters. Thanks to Tony Mechelynck +" Highlight lines longer than 78 characters. Thanks to Tony Mechelynck " from the Vim mailing list. +" It can easily be disabled if necessary with :2match (in Vim >= 700). if v:version >= 700 2match Todo /\%>78v./ else match Todo /\%>78v./ endif + +" Highlight TODO, FIXME, CHANGED and XXX in all documents. + if v:version > 701 || (v:version == 701 && has('patch42')) + call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)') + endif endif @@ -204,7 +226,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. @@ -215,10 +237,60 @@ 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 +" But not for Git commits, go to beginning of the file. + autocmd BufReadPost COMMIT_EDITMSG normal! gg + +" Make sure 'list' and 'number' is disabled in help files. This is necessary +" when switching to a help buffer which is in the background with :buffer as +" these options are local to windows (and not only to buffers). This happens +" because I often want to use only one window and thus the help buffer is in +" the background. + autocmd BufWinEnter *.txt + \ if &filetype == 'help' | + \ setlocal nolist | + \ setlocal nonumber | + \ 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 in git commits as the diff created by `git commit -v` +" may contain one which could change the filetype or other settings of the +" commit buffer. Also make sure we use only 72 characters per line which is +" the recommendation for git commit messages (http://tpope.net/node/106). + autocmd FileType gitcommit setlocal nomodeline | + \ let g:secure_modelines_allowed_items = [] | + \ setlocal textwidth=72 +" Allow folding in perl. + autocmd FileType perl let perl_fold = 1 | + \ let perl_fold_blocks = 1 +" Use the same comment string as for Vim files in Vimperator files. + autocmd FileType vimperator setlocal commentstring=\"%s + +" FTDETECT AUTO COMMANDS + +" Recognize .md as markdown files (Vim default is .mkd). + 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