X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.vimrc;h=1ac303d7a4eb7022122fa1886d4081f0941fa320;hp=23c3a0c6ad62edfabf7be317391341a28332013f;hb=2bc2bafed478dff7bd4043da8064eb3fdef389b8;hpb=1308577dbf378d0263021750260585a12176b44e

diff --git a/.vimrc b/.vimrc
index 23c3a0c..1ac303d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -65,6 +65,7 @@ set nohlsearch
 set noincsearch
 set nofoldenable
 set fo=tcq1
+set nojoinspaces
 "set textwidth=78
 set viminfo='100,\"1000,:100,/40
 let g:netrw_home = $HOME
@@ -84,10 +85,10 @@ 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>
-if $ANDROID_DATA!=#"/data"
-  " It auto-types random data after starting it from Termux
-  noremap <Esc>P :tp<cr>zz<C-g>
-endif
+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>P$r0<Space>q <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`
@@ -103,5 +104,6 @@ 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>
 
 endif "!exists("g:_kratochvil_vimrc")