From 33601ea1211b53913056abce468e9e7e3c58b39b Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 11 Aug 2021 10:50:40 +0200
Subject: [PATCH] .vimrc: Update from jkratoch.

---
 .vimrc | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.vimrc b/.vimrc
index fad69ee..696e804 100644
--- a/.vimrc
+++ b/.vimrc
@@ -4,7 +4,7 @@
 if !exists("g:_kratochvil_vimrc")
 	let g:_kratochvil_vimrc=1
 
-autocmd! filetypedetect
+"autocmd! filetypedetect
 "remove 'set tw=78':
 autocmd! BufRead *.txt
 
@@ -18,7 +18,7 @@ autocmd! BufRead *.txt
 autocmd BufCreate,VimEnter *                                             let g:BufEnter_ts= 8
 autocmd BufEnter * call BufEnter()
 autocmd VimEnter * call BufEnter()
-set runtimepath=.,$VIMRUNTIME
+set runtimepath+=.,$VIMRUNTIME
 function BufEnter()
 	if exists("g:BufEnter_ts")
 		unlet g:BufEnter_ts
@@ -39,11 +39,11 @@ function BufReadPost()
 	endif
 endfunction
 
-set encoding=utf-8
-set termencoding=utf-8
+"set encoding=utf-8
+"set termencoding=utf-8
 " fileencoding is detected from fileencodings, first one for empty files
 " 'iso-8859-2,euc-jp' really does not work for 'euc-jp'
-set fileencodings=utf-8,euc-jp,iso-8859-2
+"set fileencodings=utf-8,euc-jp,iso-8859-2
 
 set ts=8
 set sw=2
@@ -51,7 +51,9 @@ set sts=2
 ca X x
 syntax off
 let g:loaded_matchparen = 1
-set swapsync=
+if !has('nvim')
+	set swapsync=
+endif
 " vim-7+ only
 silent! set nofsync
 set noerrorbells
@@ -80,7 +82,7 @@ set nocst
 set tags=./tags,./TAGS,./../tags,./../TAGS,./../../tags,./../../TAGS,./../../../tags,./../../../TAGS,./../../../../tags,./../../../../TAGS,./../../../../../tags,./../../../../../TAGS,./../../../../../../tags,./../../../../../../TAGS,./../../../../../../../tags,./../../../../../../../TAGS,./../../../../../../../../tags,./../../../../../../../../TAGS,./../../../../../../../../../tags,./../../../../../../../../../TAGS,./../../../../../../../../../../tags,./../../../../../../../../../../TAGS,./../../../../../../../../../../../tags,./../../../../../../../../../../../TAGS,./reactos/tags,./../reactos/tags,./../../reactos/tags,,./../../../reactos/tags,./../../../../reactos/tags,./../../../../../reactos/tags,./../../../../../../reactos/tags,./w32/inc/tags,./../w32/inc/tags,./../../w32/inc/tags,,./../../../w32/inc/tags,./../../../../w32/inc/tags,./../../../../../w32/inc/tags,./../../../../../../w32/inc/tags,./../../../../../../../w32/inc/tags,/usr/src/redhat/BUILD/tags,/usr/src/redhat/BUILD/TAGS,/usr/include/tags,/usr/include/TAGS
 
 noremap <Esc>p :set invpaste paste?<cr>
-noremap <Esc>l :set invlist paste?<cr>
+noremap <Esc>l :set invlist list?<cr>
 noremap <Esc>q @q
 noremap <Esc>: @:
 noremap <C-n> :next<cr>zz<C-g>
@@ -99,15 +101,17 @@ noremap <Esc>g "myiw:grep<Space>-rEw<Space>'<C-r>m'<Space>.
 noremap <C-]> <C-]>zz<C-g>
 noremap <C-t> <C-t>zz<C-g>
 noremap <C-d> G:r !date '+\%H:\%M:\%S-'<cr>kA
-noremap <Esc>d :set hlsearch<cr>/^[+-]\([^+-].*\\|\)$<cr>
-noremap <Esc>D :set hlsearch<cr>/^[+-][+-]\([^+-].*\\|\)$<cr>
+noremap <Esc>s :set hlsearch<cr>/^[+-]\([^+-].*\\|\)$<cr>
+noremap <Esc>S :set hlsearch<cr>/^[+-][+-]\([^+-].*\\|\)$<cr>
 noremap <Esc>w 0i <Esc>/[^ ]<cr>vf.h"kyf./[^ ]<cr>vf.h"ly0x:r !date -d "`date '+\%Y'`-<C-r>l-<C-r>k" '+\%u'<cr>yypkV:!tr '1234567' 'PUSCPSN'<cr>jV:!tr '1234567' 'otttaoe'<cr>kJxv0xk0llllllplxxjddk0
-noremap <Esc>s :syntax on<cr>:set syntax=wdiff<cr>
+noremap <Esc>e :syntax on<cr>:set syntax=wdiff<cr>
 noremap * :let ic_save=&ic<cr>:set noic<cr>*:let &ic=ic_save<cr>
 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>m :w<cr>:make<cr>
+noremap <Esc>3 /^<char-60><char-60><char-60><char-60><char-60><char-60><char-60><cr>ddV/^<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>m :w<cr>:set makeprg=make<cr>:make<cr>
+noremap <Esc>n :w<cr>:set makeprg=ninja<cr>:make<cr>
 
 endif "!exists("g:_kratochvil_vimrc")
-- 
1.8.3.1