Merge branch 'master' of git.246060.ru:f1x1t/vimrc

autoload/plug.vim

@@ -405,7 +405,7 @@ function! plug#end()
 
   for [map, names] in items(lod.map)
     for [mode, map_prefix, key_prefix] in
-          \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
+          \ [['i', '<C-\><C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
       execute printf(
       \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
       \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)

hosts/awesome.vimrc

@@ -1 +1 @@
-set guifont=Iosevka\ Fixed\ SS08\ 18
+set guifont=Iosevka\ Prog\ 18

hosts/ptah.vimrc

@@ -1 +1 @@
-set guifont=Iosevka\ Fixed\ SS08\ 18
+set guifont=Iosevka\ Prog\ 18

hosts/tpl380.vimrc

@@ -1 +1 @@
-set guifont=Iosevka\ Fixed\ SS08\ 10
+set guifont=Iosevka\ Prog\ 10

vimrc

@@ -148,6 +148,7 @@ Plug 'python-mode/python-mode', { 'for': 'python', 'branch': 'develop' }
 " Shell "
 Plug 'itspriddle/vim-shellcheck'
 
+Plug 'rhysd/vim-grammarous'
 
 " Перечисление плагинов заканчивается здесь "
 call plug#end()
@@ -488,6 +489,66 @@ if executable('ag')
 	let g:ctrlp_use_caching = 0
 endif
 
+"""
+""" Settings from mswin.vim
+"""
+if has("clipboard")
+	" CTRL-X and SHIFT-Del are Cut
+	vnoremap <C-X> "+x
+	vnoremap <S-Del> "+x
+
+	" CTRL-C and CTRL-Insert are Copy
+	vnoremap <C-C> "+y
+	vnoremap <C-Insert> "+y
+
+	" CTRL-V and SHIFT-Insert are Paste
+	map <C-V>		"+gP
+	map <S-Insert>		"+gP
+
+	cmap <C-V>		<C-R>+
+	cmap <S-Insert>		<C-R>+
+endif
+
+" Pasting blockwise and linewise selections is not possible in Insert and
+" Visual mode without the +virtualedit feature.  They are pasted as if they
+" were characterwise instead.
+" Uses the paste.vim autoload script.
+" Use CTRL-G u to have CTRL-Z only undo the paste.
+
+if 1
+    exe 'inoremap <script> <C-V> <C-G>u' . paste#paste_cmd['i']
+    exe 'vnoremap <script> <C-V> ' . paste#paste_cmd['v']
+endif
+
+imap <S-Insert>		<C-V>
+vmap <S-Insert>		<C-V>
+
+" Use CTRL-Q to do what CTRL-V used to do
+noremap <C-Q>		<C-V>
+
+" Use CTRL-S for saving, also in Insert mode (<C-O> doesn't work well when
+" using completions).
+noremap <C-S>		:update<CR>
+vnoremap <C-S>		<C-C>:update<CR>
+inoremap <C-S>		<Esc>:update<CR>gi
+
+" For CTRL-V to work autoselect must be off.
+" On Unix we have two selections, autoselect can be used.
+if !has("unix")
+  set guioptions-=a
+endif
+
+" CTRL-Z is Undo; not in cmdline though
+noremap <C-Z> u
+inoremap <C-Z> <C-O>u
+
+" CTRL-Y is Redo (although not repeat); not in cmdline though
+noremap <C-Y> <C-R>
+inoremap <C-Y> <C-O><C-R>
+"""
+"""
+"""
+
 " Use a leader instead of the actual named binding
 nmap <leader>p :CtrlP<cr>