X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=f469e3992cbf67e99ebb03086af1050bea92c01c;hb=18ec810d344e350085d8dce1c0952cafadca8f9d;hp=8e64ca0204701c964fc05040a4532fcff0cead7c;hpb=4c23170a02f7c119715c19ae3293a563f34d9b33;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 8e64ca0..f469e39 100644 --- a/vimrc +++ b/vimrc @@ -1,14 +1,36 @@ " Vim main configuration file. +" EDITOR SETTINGS + " Make sure Vim (and not Vi) settings are enabled. set nocompatible +" 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 + " EDIT SETTINGS " Enable automatic file detection, plugin and indention. -filetype plugin indent on +if has("autocmd") + filetype plugin indent on +endif " Use UTF-8 file encoding for all files. set fileencodings=utf-8 @@ -46,13 +68,16 @@ 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. -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 " Only check for case if the searched word contains a capital character. set ignorecase @@ -64,6 +89,9 @@ if v:version >= 700 set spelllang=en_us endif +" Allow buffers with changes to be hidden. +set hidden + " DISPLAY SETTINGS @@ -82,41 +110,41 @@ 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:- +set listchars=trail:-,nbsp:!,extends:> -" EDITOR SETTINGS +" MAPPINGS (except for plugins, see PLUGIN SETTINGS below) -" Don't use any modelines. -set nomodeline +" Use to move down a page and - to move up one like in mutt. +nnoremap +nnoremap - -" When completing paths first use the longest path then display a list of all -" possible files. -set wildmode=longest,list +" 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 -" Increase number of tabs which can be opened with the -p option. +" Maps to change spell language between English and German and disable it. if v:version >= 700 - set tabpagemax=50 + map sn :set nospell + map se :set spell spelllang=en_us + map sd :set spell spelllang=de_de endif - -" MAPPINGS - -" Use "," as my mapleader. -let mapleader = "," -let maplocalleader = "," - -" Settings for the NERD commenter. -" Don't create any mappings I don't want to use. -let NERDCreateDefaultMappings=0 -" 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 +" 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. " Thanks to Tony Mechelynck from the Vim @@ -124,22 +152,34 @@ map sd :set spelllang=de_de 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 " Disable Apple style movements in MacVim. -if has("gui_macvim") +if has("gui_macvim") && has("eval") let macvim_skip_cmd_opt_movement = 1 endif @@ -147,9 +187,40 @@ 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 +endif + +" PLUGIN SETTINGS -" Automatically save and the load the file state (stored in ~/.vim/view). -autocmd BufWrite * mkview -autocmd BufRead * loadview +" 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 + +" 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 + + augroup END +endif