X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.vimrc;h=696e8044822ab5dad7390e544295c7004f1e2288;hp=4d92b55adfbed4fb8a302d63d295893ce14d9997;hb=HEAD;hpb=1f1bea31ca993f898ef44dc2ba265c9f5dcd68cc

diff --git a/.vimrc b/.vimrc
index 4d92b55..2322696 100644
--- a/.vimrc
+++ b/.vimrc
@@ -89,15 +89,19 @@ noremap <Esc>: @:
 noremap <C-n> :next<cr>zz<C-g>
 noremap <C-p> :prev<cr>zz<C-g>
 noremap <Esc>N :tn<cr>zz<C-g>
-noremap <Esc>P :tp<cr>zz<C-g>
-"<Esc>P would auto-type random data after starting it on recent distros or Termux.
-"read(0, "\33P1$r0 q\33\\\33[?12;4$y", 4096) = 19
-noremap <Esc>P1$r0<Space>q <Nop>
+if $ANDROID_DATA!=#"/data" && $SSH_CLIENT!~"^2a02:2b88:2:1::3b57:[89]f "
+  " It auto-types random data after starting it from Termux
+  " Now all VIM version are affected:
+  noremap <Esc>P :tp<cr>zz<C-g>
+  noremap <Esc>P1$r0<Space>q <Nop>
+endif
 " Termux types <F11>
 noremap! <Esc>[23~ <Nop>
 noremap <Esc>M :cn<cr>zz<C-g>
 noremap <Esc>L :cp<cr>zz<C-g>
-noremap <Esc>f "myiw:grep<Space>-Ew<Space>'<C-r>m'<Space>`git ls-files`
+" dnf install vim-fugitive
+noremap <Esc>f "myiw:Ggrep<Space>-Ew<Space>'<C-r>m'<Space>
+noremap <Esc>F "myiw:grep<Space>-Ew<Space>'<C-r>m'<Space>`git ls-files`
 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>
@@ -111,7 +115,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>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>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>