X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=b200fa4b63a2710da59db4995b0993cff65a8b47;hb=ed477ab1941771cf9a96ab54d7f8fea9ba05ac94;hp=cfa181bc5f7925f84bc98d3eb86d5795b2d76fd3;hpb=95d2fc838ee9187f7c6488d449d7769b77b0f3db;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index cfa181b..b200fa4 100644 --- a/vimrc +++ b/vimrc @@ -1,14 +1,40 @@ " Vim main configuration file. +" EDITOR SETTINGS + " Make sure Vim (and not Vi) settings are enabled. set nocompatible -" Enable automatic filedection, plugin and indention load. -filetype plugin indent on +" Load my scripts from ~/.vim (my scripts), ~/.vim/plugins (plugins) and +" ~/.vim/runtime (checkout of Vim runtime files). +set runtimepath-=~/.vim +set runtimepath^=~/.vim,~/.vim/plugins,~/.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 -" Use utf-8 file encoding for all files. -set fileencodings=utf-8 + +" EDIT SETTINGS + +" Enable automatic file detection, plugin and indention. +if has('autocmd') + filetype plugin indent on +endif + +" 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 @@ -25,24 +51,50 @@ set tabstop=8 " Enable auto indention. set autoindent +" When joining lines only add one space after a sentence. +set nojoinspaces + +" Allow backspacing over autoindent and line breaks. +set backspace=indent,eol + +" Start a comment when hitting enter after a commented line (r) and when using +" o or O around a commented line (o). +set formatoptions+=ro +" Don't break a line if was already longer then 'textwidth' when insert mode +" started. +set formatoptions+=l + +" Allow virtual editing (cursor can be positioned anywhere, even when there is +" no character) in visual block mode. +set virtualedit=block + " Already display matches while typing the search command. This makes spotting -" errors easily. +" errors easy. set incsearch " Activate syntax folding. -set foldmethod=syntax -set foldcolumn=2 -set foldlevel=99 " no folding at default +if has('folding') + set foldmethod=syntax + set foldcolumn=2 + set foldlevel=99 " no closed folds at default, 'foldenable' would disable + " folding which is not what I want +endif -" Use smartcase mode when searching; only check for case if the searched word -" contains a capital character. +" Only check for case if the searched word contains a capital character. set ignorecase set smartcase " Activate spell checking, use English as default. -set spell -set spelllang=en_us +if v:version >= 700 + set spell + set spelllang=en_us +endif + +" Allow buffers with changes to be hidden. +set hidden + +" DISPLAY SETTINGS " Use a dark background. set background=dark @@ -55,69 +107,121 @@ set ruler set showcmd " Visualize the line the cursor is currently in. -set cursorline +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:- - - -" When joining lines only add one space after a sentence. -set nojoinspaces +set listchars=trail:-,nbsp:!,extends:> + + +" MAPPINGS (except for plugins, see PLUGIN SETTINGS below) + +" Use to move down a page and - to move up one like in mutt. +nnoremap +nnoremap - + +" 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 -" Allow backspacing over autoindent, line breaks and insert mode starts. -set backspace=indent,eol,start +" 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('.') . ';') -" Start a comment when hitting enter after a commented line (r) and when using -" o or O around a commented line (o). -set formatoptions+=ro -" Don't break a line if was already longer then 'textwidth' when insert mode -" started. -set formatoptions+=l +" 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 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 +endif -" Don't use any modelines. -set nomodeline +" Disable Apple style movements in MacVim. +if has('gui_macvim') && has('eval') + let macvim_skip_cmd_opt_movement = 1 +endif -" When completing paths first use the longest path then display a list of all -" possible files. -set wildmode=longest,list +" SYNTAX SETTINGS +" Activate syntax coloring. +if has('syntax') + syntax enable + +" Highlight text longer then 78 characters. Thanks to Tony Mechelynck +" from the Vim mailing list. + if v:version >= 700 + 2match Todo /\%>78v./ + else + match Todo /\%>78v./ + endif +endif -" Use "," as my mapleader. -let mapleader = "," -let maplocalleader = "," +" PLUGIN SETTINGS " Settings for the NERD commenter. " Don't create any mappings I don't want to use. -let NERDCreateDefaultMappings=0 +if has('eval') + let NERDCreateDefaultMappings = 0 +endif " Map toggle comment. map NERDCommenterToggle -" Maps to change spell language between English and German. -map se :set spelllang=en_us -map sd :set spelllang=de_de +" AUTO COMMANDS -" I often type "W" instead of "w" when trying to save a file. Fix my mistake. -cmap W w -cmap Wq wq -" Also fix my typo with "Q". -cmap Q q +" Use a custom auto group to prevent problems when the vimrc files is sourced +" twice. +if has('autocmd') + augroup vimrc + autocmd! +" Use diff filetype for mercurial patches in patch queue. + autocmd BufReadPost */.hg/patches/* set filetype=diff -" Disable Apple style movements in MacVim. -if has("gui_macvim") - let macvim_skip_cmd_opt_movement = 1 + augroup END endif - - -" Activate syntax coloring. -syntax enable - - -" Automatically save and the load the file state (stored in ~/.vim/view). -autocmd BufWrite * mkview -autocmd BufRead * loadview