X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=c9d57d0d5a5bf9f3747eda0292bd992fa36bb979;hb=9b55a53d51a88147c6f978931ee8e21a807cd276;hp=d0371b559d90896cd8a629b08731fd4c3d5e431c;hpb=4f5d6b5591ec3cf2632f88c2e845ca7bf787cd6d;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index d0371b5..c9d57d0 100644
--- a/vimrc
+++ b/vimrc
@@ -4,10 +4,10 @@
 " EDITOR SETTINGS
 
 " Prevent editing as root as it may cause security problems. Use sudoedit
-" instead. Thanks to godlygeek in #vim on Freenode (2009-06-19 22:21).
+" instead. Thanks to godlygeek in #vim on Freenode (2009-06-19 22:21 CEST).
 if $HOME == '/root' || exists('$SUDO_USER')
     echomsg 'Running as root is forbidden! Use sudoedit.'
-    qa
+    qall
 endif
 
 
@@ -39,9 +39,16 @@ set directory-=.
 " 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
+" Complete to longest common string (list:longest) and then complete all full
+" matches after another (full). Thanks to pbrisbin
+" (http://pbrisbin.com:8080/dotfiles/vimrc).
+set wildmode=list:longest,full
+
+" Increase history of executed commands (:).
+set history=1000
+
+" Increase number of possible undos.
+set undolevels=1000
 
 " Use strong encryption if possible, also used for swap/undo files.
 if v:version >= 703
@@ -134,7 +141,7 @@ if v:version >= 700
     set numberwidth=1
 endif
 " Display the ruler with current line/file position. If 'statusline' is used
-" then this only affects <C-g>.
+" then this only affects <C-G>.
 set ruler
 " Display partial commands in the status line.
 set showcmd
@@ -172,6 +179,7 @@ if has('statusline')
 
     " on the right
     set statusline+=%=                " right align
+    set statusline+=0x%-8B\           " current character under cursor as hex
     set statusline+=%-12.(%l,%c%V%)\  " line number (%l),
                                       " column number (%c),
                                       " virtual column number if different
@@ -184,30 +192,45 @@ endif
 
 " Easy way to exit insert mode.
 inoremap jj <Esc>
+" Also for command mode, thanks to http://github.com/mitechie/pyvim
+" (2010-10-15).
+cnoremap jj <C-C>
 
 " Disable arrow keys for all modes except command modes. Thanks to James Vega
 " (http://git.jamessan.com/?p=etc/vim.git;a=summary).
-map <right> <nop>
-map <left>  <nop>
-map <up>    <nop>
-map <down>  <nop>
-imap <right> <nop>
-imap <left>  <nop>
-imap <up>    <nop>
-imap <down>  <nop>
-" Also disable up and down array in command mode, use <C-p>/<C-n> as
-" replacement (see below).
-cmap <up> <nop>
-cmap <down> <nop>
+map <Right>  <Nop>
+map <Left>   <Nop>
+map <Up>     <Nop>
+map <Down>   <Nop>
+imap <Right> <Nop>
+imap <Left>  <Nop>
+imap <Up>    <Nop>
+imap <Down>  <Nop>
+" Also disable arrow keys in command mode, use <C-P>/<C-N> as replacement (see
+" below).
+cmap <Up>    <Nop>
+cmap <Down>  <Nop>
+cmap <Right> <Nop>
+cmap <Left>  <Nop>
 
 " Use Ctrl-P/Ctrl-N as replacement for <Up>/<Down> in command mode. Thanks to
-" abstrakt and grayw in #vim on Freenode (2010-04-12 21:20).
-cnoremap <C-p> <up>
-cnoremap <C-n> <down>
+" abstrakt and grayw in #vim on Freenode (2010-04-12 21:20 CEST).
+cnoremap <C-P> <Up>
+cnoremap <C-N> <Down>
+
+" Use <Space> to move down a page and - to move up one like in mutt.
+nnoremap <Space> <C-F>
+nnoremap - <C-B>
+
+" Behave like 'scrolloff' but only while searching. Thanks to "Benjamin R.
+" Haskell" <vim@benizi.com> from the Vim mailing list (2010-10-26).
+nnoremap n nzv3j3k
+nnoremap N Nzv3k3j
 
-" Use <space> to move down a page and - to move up one like in mutt.
-nnoremap <Space> <C-f>
-nnoremap - <C-b>
+" Go to next and previous buffer. Thanks to elik in #vim on Freenode
+" (2010-05-16 18:38 CEST) for this idea.
+nnoremap <silent> gb :bnext<CR>
+nnoremap <silent> gB :bprev<CR>
 
 " Fast access to buffers.
 nnoremap <Leader>1 :1b<CR>
@@ -222,14 +245,14 @@ nnoremap <Leader>9 :9b<CR>
 nnoremap <Leader>0 :10b<CR>
 
 " Make last active window the only window. Similar to <C-w> o.
-nnoremap <C-w>O <C-w>p<C-w>o
+nnoremap <C-W>O <C-W>p<C-W>o
 
 " Maps to change spell language between English and German and disable spell
 " checking.
 if v:version >= 700
-    map <Leader>sn :set nospell<CR>
-    map <Leader>se :set spell spelllang=en_us<CR>
-    map <Leader>sd :set spell spelllang=de_de<CR>
+    noremap <Leader>sn :set nospell<CR>
+    noremap <Leader>se :set spell spelllang=en_us<CR>
+    noremap <Leader>sd :set spell spelllang=de_de<CR>
 endif
 
 " Add semicolon to the end of the line. Thanks to
@@ -237,6 +260,20 @@ endif
 " on Freenode for an improved version which doesn't clobber any marks.
 nnoremap <silent> <Leader>; :call setline(line('.'), getline('.') . ';')<CR>
 
+" * and # for selections in visual mode. Thanks to
+" http://got-ravings.blogspot.com/2008/07/vim-pr0n-visual-search-mappings.html
+" and all nerds involved (godlygeek, strull in #vim on Freenode).
+if has('eval')
+    function! s:VSetSearch()
+        let temp = @@
+        normal! gvy
+        let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g')
+        let @@ = temp
+    endfunction
+    vnoremap * :<C-U>call <SID>VSetSearch()<CR>//<CR>
+    vnoremap # :<C-U>call <SID>VSetSearch()<CR>??<CR>
+endif
+
 " I often type "W" instead of "w" when trying to save a file. Fix my mistake.
 " Thanks to Tony Mechelynck <antoine.mechelynck@gmail.com> from the Vim
 " mailing list for the commands.
@@ -279,6 +316,17 @@ if has('gui_macvim') && has('eval')
     let macvim_skip_cmd_opt_movement = 1
 endif
 
+" In case 'hlsearch' is used disable it with <C-L>. Thanks to frogonwheels and
+" vimgor (bot) in #vim on Freenode (2010-03-30 05:58 CEST).
+noremap <silent> <C-L> :nohlsearch<CR><C-L>
+
+
+" ABBREVIATIONS
+
+" Fix some of my spelling mistakes.
+iabbrev relle reelle
+iabbrev reele reelle
+
 
 " SYNTAX SETTINGS
 
@@ -286,10 +334,10 @@ endif
 if has('syntax')
     syntax enable
 
-" Don't highlight more than 200 columns as I normally don't have that long
+" 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=200
+    set synmaxcol=500
 
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
@@ -315,7 +363,7 @@ if has('eval')
     let NERDCreateDefaultMappings = 0
 endif
 " Map toggle comment.
-map <Leader><Leader> <plug>NERDCommenterToggle
+map <Leader><Leader> <Plug>NERDCommenterToggle
 
 " XPTemplate settings.
 if has('eval')
@@ -356,6 +404,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.
@@ -386,6 +439,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