X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=612ebd98a3ff65841e8f4abba48eac4655d9d302;hb=c778ff27e474ceea3dbae546c5c62d28f1b13ebd;hp=86c23f01ea9f2c4c4e06f8eddb1020e79bb770cf;hpb=ffc6448b1ec43876723434c3140480fb028a7ac9;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 86c23f0..612ebd9 100644
--- a/vimrc
+++ b/vimrc
@@ -7,7 +7,7 @@
 " 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
 
 
@@ -134,7 +134,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
@@ -184,30 +184,35 @@ 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>
+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>
+" 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) for this idea.
@@ -227,14 +232,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
@@ -242,6 +247,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.
@@ -320,7 +339,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')
@@ -396,6 +415,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