X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=7d1f0aef93967db3d0904d25770e50477755116d;hb=63c87697a4eafe134ae1196021afd8441c6b4e33;hp=d5496e6f7cd53872212cbe844ecae6f96618ff31;hpb=0dc31a4dc0d8558f193c4284d0879c2d1e042856;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index d5496e6..7d1f0ae 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
 
 
@@ -184,6 +184,9 @@ 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).
@@ -203,7 +206,7 @@ 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).
+" abstrakt and grayw in #vim on Freenode (2010-04-12 21:20 CEST).
 cnoremap <C-P> <Up>
 cnoremap <C-N> <Down>
 
@@ -211,8 +214,13 @@ cnoremap <C-N> <Down>
 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
+
 " Go to next and previous buffer. Thanks to elik in #vim on Freenode
-" (2010-05-16 18:38) for this idea.
+" (2010-05-16 18:38 CEST) for this idea.
 nnoremap <silent> gb :bnext<CR>
 nnoremap <silent> gB :bprev<CR>
 
@@ -244,6 +252,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.