X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=35b983095bc556cff7a9f1850d83eb558faa08a1;hb=1d73991ce43d1743f7f875d98e41986dc9f96a53;hp=82e8d33b2dcd01d9394f9d27f5dec90909f64f2e;hpb=9dd86353a61b41cf6a1de3c3741e8af8ac232c11;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 82e8d33..35b9830 100644
--- a/vimrc
+++ b/vimrc
@@ -483,13 +483,16 @@ endif
 " modified by a plugin or other settings. Except for <Nop> which isn't
 " affected by mappings.
 
-" Easy way to exit insert mode. jk is preferred because it's faster.
-inoremap jj <Esc>
+" Easy way to exit insert mode (jj is too slow).
 inoremap jk <Esc>
 " Also for command mode, thanks to http://github.com/mitechie/pyvim
 " (2010-10-15).
-cnoremap jj <C-C>
 cnoremap jk <C-C>
+" And fix my typos ...
+inoremap JK <Esc>
+inoremap Jk <Esc>
+cnoremap JK <C-C>
+cnoremap Jk <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).
@@ -540,6 +543,10 @@ if has('eval')
         \ :call <SID>TemporaryNostartofline("<Bslash><Lt>C-U>")<CR>
 endif
 
+" Let Y yank to the end of the line, similar to D and C. Use yy if you want to
+" yank a line. This fixes a weird inconsistency in Vi(m).
+nnoremap Y y$
+
 " Write before suspending, thanks to deryni in #vim on Freenode (2011-05-09
 " 20:02 CEST). To suspend without saving either unmap this or use :stop<CR>.
 " Only the current buffer is written, thus switching to another buffer works