X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=5be58ef57276222c21321af5f49db9cec62fe157;hb=4a3e3732def778c6ac94e0ff29b8ce3ec9768541;hp=7f8700e667e99334f5098bc35012278b8d0196c8;hpb=5cd07a9436b3621643b3dc17b7891c8fbab0aa12;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 7f8700e..5be58ef 100644 --- a/vimrc +++ b/vimrc @@ -1,14 +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 -" Enable automatic filedection, plugin and indention load. -filetype plugin indent on +" 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 -" Use utf-8 file encoding for all files. -set fileencodings=utf-8 +" 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,80 +51,191 @@ set tabstop=8 " Enable auto indention. set autoindent -" Activate lines display. -set number -" Display the ruler with current line/file position. -set ruler -" Display partial commands in the status line. -set showcmd - -" Activate syntax folding. -set foldmethod=syntax -set foldcolumn=2 -set foldlevel=99 " no folding at default - -" Use smartcase mode when searching; 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 - " When joining lines only add one space after a sentence. set nojoinspaces -" Allow backspacing over autoindent, line breaks and insert mode starts. -set backspace=indent,eol,start +" Allow backspacing over autoindent and line breaks. +set backspace=indent,eol -" Add a comment when hitting enter after a commented line (r) and when using o -" or O around a commented line (o). +" 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 -" Don't use any modelines. -set nomodeline +" Already display matches while typing the search command. This makes spotting +" errors easy. +set incsearch -" When completing paths first use the longest path then display a list of all -" possible files. -set wildmode=longest,list +" Activate syntax folding. +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 + +" Only check for case if the searched word contains a capital character. +set ignorecase +set smartcase + +" 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 -" Visualize the line the cursor is currently in. -set cursorline + +" DISPLAY SETTINGS " Use a dark background. set background=dark +" Activate lines display. +set number +" Display the ruler with current line/file position. +set ruler +" Display partial commands in the status line. +set showcmd + +" Visualize the line the cursor is currently in. +if v:version >= 700 + set cursorline +endif -" Use "," as my mapleader. -let mapleader = "," -let maplocalleader = "," +" Display tabs, trailing space, non breakable spaces and long lines (when +" wrapping is enabled). +set list +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 -" Settings for the NERD commenter. -" Don't create any mappings I don't want to use. -let NERDCreateDefaultMappings=0 -" Map toggle comment. -map NERDCommenterToggle +" 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('.') . ';') " I often type "W" instead of "w" when trying to save a file. Fix my mistake. -cmap W w -cmap Wq wq +" 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 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") +if has('gui_macvim') && has('eval') let macvim_skip_cmd_opt_movement = 1 endif +" SYNTAX SETTINGS + " Activate syntax coloring. -syntax enable +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 + +" Highlight TODO, FIXME, CHANGED and XXX in all documents. + if v:version >= 701 && has('patch40') + call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)') + endif +endif + + +" PLUGIN SETTINGS + +" Settings for the NERD commenter. +" Don't create any mappings I don't want to use. +if has('eval') + let NERDCreateDefaultMappings = 0 +endif +" Map toggle comment. +map NERDCommenterToggle + +" AUTO COMMANDS -" Automatically save and the load the file state (stored in ~/.vim/view). -autocmd BufWrite * mkview -autocmd BufRead * loadview +" Use a custom auto group to prevent problems when the vimrc files is sourced +" twice. +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 + +" Use diff filetype for mercurial patches in patch queue. + autocmd BufReadPost */.hg/patches/* set filetype=diff + + augroup END +endif