.vimrc: <Esc>3: More rework/fixes.

diff --git a/.vimrc b/.vimrc
index 31f765b..e3dd08e 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -113,7 +113,7 @@ noremap # :let ic_save=&ic<cr>:set noic<cr>#:let &ic=ic_save<cr>
 noremap <C-k> :w<cr>:!aspell --check '%'<cr>:e<cr>
 noremap gq] gq/^. \?$<cr>
 noremap <Esc>1 :w<cr>:make -j1<cr>
-noremap <Esc>3 /^<char-60><char-60><char-60><char-60><char-60><char-60><char-60><cr>ddVk/^<bar><bar><bar><bar><bar><bar><bar><cr>k:w! 1<cr>gvxddV/^=======<cr>k:w! 2<cr>gvxddV/^<char-62><char-62><char-62><char-62><char-62><char-62><char-62><cr>k:w! 3<cr>/^<char-62><char-62><char-62><char-62><char-62><char-62><char-62><cr>dd''0:!diff -u 2 1<cr>
+noremap <Esc>3 /^<char-60><char-60><char-60><char-60><char-60><char-60><char-60><cr>kmajd$V/^<bar><bar><bar><bar><bar><bar><bar><cr>k:w! 1<cr>gvxd$V/^=======<cr>k:w! 2<cr>gvxd$V/^<char-62><char-62><char-62><char-62><char-62><char-62><char-62><cr>k:w! 3<cr>gvxdd'a0:!diff -u 2 1;diff -u 2 3<cr>
 noremap <Esc>m :w<cr>:set makeprg=make<cr>:make<cr>
 noremap <Esc>n :w<cr>:set makeprg=ninja<cr>:make<cr>