X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=fef44f22ca13e31a36991bce41c41035d30551d4;hb=c213332c656613a946df4b21dd7ec6c5fd512a14;hp=9dc6bdfa3d1b1e74f9fbdfc0b3eedeffa7698772;hpb=7907b469979fa223fc69a13af850c7a82d7d44b7;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 9dc6bdf..fef44f2 100644 --- a/vimrc +++ b/vimrc @@ -7,13 +7,22 @@ " instead. Thanks to godlygeek in #vim on Freenode (2009-06-19 22:21). if $HOME == '/root' || exists('$SUDO_USER') echomsg 'Running as root is forbidden! Use sudoedit.' - qa + qall endif -" Reset all options (except 'term, 'lines' and 'columns'). This makes sure a +" Save 'runtimepath' in case it was changed by the system's configuration +" files. +if has('eval') + let s:save_runtimepath = &runtimepath +endif +" Reset all options (except 'term', 'lines' and 'columns'). This makes sure a " system wide configuration file doesn't change default values. set all& +" And restore it after all other options were reset. +if has('eval') + let &runtimepath = s:save_runtimepath +endif " Make sure Vim (and not Vi) settings are used. set nocompatible @@ -23,6 +32,9 @@ set nocompatible set runtimepath-=~/.vim set runtimepath^=~/.vim,~/.vim/runtime +" Don't store swap files in the same directory as the edited file. +set directory-=. + " Disable modelines as they may cause security problems. Instead use " securemodelines (Vim script #1876). set nomodeline @@ -31,6 +43,11 @@ set nomodeline " possible files. set wildmode=longest,list +" Use strong encryption if possible, also used for swap/undo files. +if v:version >= 703 + set cryptmethod=blowfish +endif + " EDIT SETTINGS @@ -111,19 +128,28 @@ set background=dark " Display line numbers. set number +" But use as little space as necessary for the numbers column. Thanks to James +" Vega (http://git.jamessan.com/?p=etc/vim.git;a=summary). +if v:version >= 700 + set numberwidth=1 +endif " Display the ruler with current line/file position. If 'statusline' is used -" then this only affects . +" then this only affects . set ruler " Display partial commands in the status line. set showcmd +" Don't redraw screen when executing macros; increases speed. Thanks to James +" Vega (http://git.jamessan.com/?p=etc/vim.git;a=summary). +set lazyredraw + " Visualize the line the cursor is currently in. if v:version >= 700 set cursorline endif " Display tabs, trailing space, non breakable spaces and long lines (when -" wrapping is enabled). +" wrapping is disabled). set list set listchars=trail:-,extends:> if v:version >= 700 @@ -156,9 +182,42 @@ endif " MAPPINGS (except for plugins, see PLUGIN SETTINGS below) -" Use to move down a page and - to move up one like in mutt. -nnoremap -nnoremap - +" Easy way to exit insert mode. +inoremap jj +" Also for command mode, thanks to http://github.com/mitechie/pyvim +" (2010-10-15). +cnoremap jj + +" Disable arrow keys for all modes except command modes. Thanks to James Vega +" (http://git.jamessan.com/?p=etc/vim.git;a=summary). +map +map +map +map +imap +imap +imap +imap +" Also disable arrow keys in command mode, use / as replacement (see +" below). +cmap +cmap +cmap +cmap + +" Use Ctrl-P/Ctrl-N as replacement for / in command mode. Thanks to +" abstrakt and grayw in #vim on Freenode (2010-04-12 21:20). +cnoremap +cnoremap + +" Use to move down a page and - to move up one like in mutt. +nnoremap +nnoremap - + +" Go to next and previous buffer. Thanks to elik in #vim on Freenode +" (2010-05-16 18:38) for this idea. +nnoremap gb :bnext +nnoremap gB :bprev " Fast access to buffers. nnoremap 1 :1b @@ -173,14 +232,14 @@ nnoremap 9 :9b nnoremap 0 :10b " Make last active window the only window. Similar to o. -nnoremap O po +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 - map sd :set spell spelllang=de_de + noremap sn :set nospell + noremap se :set spell spelllang=en_us + noremap sd :set spell spelllang=de_de endif " Add semicolon to the end of the line. Thanks to @@ -237,9 +296,14 @@ endif if has('syntax') syntax enable +" Don't highlight more than 500 columns as I normally don't have that long +" lines and they slow down syntax coloring. Thanks to Derek Wyatt +" (http://www.derekwyatt.org/vim/the-vimrc-file/). + set synmaxcol=500 + " 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). +" from the Vim mailing list. It can easily be +" disabled when necessary with :2match (in Vim >= 700). if v:version >= 700 2match Todo /\%>78v./ else @@ -261,7 +325,18 @@ if has('eval') let NERDCreateDefaultMappings = 0 endif " Map toggle comment. -map NERDCommenterToggle +map NERDCommenterToggle + +" XPTemplate settings. +if has('eval') + " Try to maintain snippet rendering even after editing outside of a + " snippet. + let g:xptemplate_strict = 0 + " Don't complete any braces automatically. + let g:xptemplate_brace_complete = 0 + " Only highlight the current placeholder. + let g:xptemplate_highlight = 'current' +endif " AUTO COMMANDS @@ -291,6 +366,11 @@ if has('autocmd') \ setlocal nonumber | \ endif +" Automatically disable 'paste' mode when leaving insert mode. Thanks to +" Raimondi in #vim on Freenode (2010-08-14 23:01 CEST). Very useful as I only +" want to paste once and then 'paste' gets automatically unset. + autocmd InsertLeave * set nopaste + " AFTER/FTPLUGIN AUTO COMMANDS " Disable spell checking for files which don't need it. @@ -321,6 +401,10 @@ if has('autocmd') " OTHER AUTO COMMANDS +" Disable spell checking, displaying of list characters and long lines when +" viewing documentation. + autocmd BufReadPost /usr/share/doc/* setlocal nospell nolist | 2match + " Use diff filetype for mercurial patches in patch queue. autocmd BufReadPost */.hg/patches/* set filetype=diff