aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vimrc-full16
1 files changed, 10 insertions, 6 deletions
diff --git a/vimrc-full b/vimrc-full
index 83edbfa..8475d0a 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -202,9 +202,9 @@ set cmdheight=2 | " sets the command line's height
202set signcolumn=yes | " auto=auto hide, yes=always, no=never show the column with error indicators 202set signcolumn=yes | " auto=auto hide, yes=always, no=never show the column with error indicators
203set nocursorcolumn | " turn visual cursor column off (improves performance) 203set nocursorcolumn | " turn visual cursor column off (improves performance)
204set updatetime=80 | " updates the screen more often 204set updatetime=80 | " updates the screen more often
205set redrawtime=1000 | " Timeout in milliseconds for redrawing the screen (switches syntax off when ssh too slow) / CTRL+L to retry 205set redrawtime=1500 | " Timeout in milliseconds for redrawing the screen (switches syntax off when ssh too slow) / CTRL+L to retry
206set notimeout | " improves performance but is known to cause problems on slow terminals 206set notimeout | " improves performance but is known to cause problems on slow terminals
207set ttimeout ttimeoutlen=250 | " set esc key timeout in ms- 207set ttimeout ttimeoutlen=150 | " set esc key timeout in ms-
208set showcmd | " essential: show keys of combined commands in the lower right corner (BUT SLOW, makes cursor flickering) 208set showcmd | " essential: show keys of combined commands in the lower right corner (BUT SLOW, makes cursor flickering)
209set showtabline=2 | " 0: never, 1: only if there are at least two tabs, 2:always 209set showtabline=2 | " 0: never, 1: only if there are at least two tabs, 2:always
210set shortmess+=I | " don't give the intro message when starting Vim |:intro|. 210set shortmess+=I | " don't give the intro message when starting Vim |:intro|.
@@ -272,6 +272,10 @@ if has('nvim') " Neovim?
272 " use default ESC key to leave insert mode in the internal terminal emulator 272 " use default ESC key to leave insert mode in the internal terminal emulator
273 tnoremap <Esc> <C-\><C-n> 273 tnoremap <Esc> <C-\><C-n>
274" set shada+=n~/.vim/shada | " shada file to use 274" set shada+=n~/.vim/shada | " shada file to use
275"
276 menu &UI.&Open\ in\ Serversession
277 \ :execute ':!nvr --servername /tmp/nvimsocket --remote % +'.line('.')<CR>:stopinsert<CR>:set readonly<CR>
278
275else " default Vim? 279else " default Vim?
276 autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib") 280 autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib")
277 281
@@ -287,6 +291,10 @@ else " default Vim?
287 if version >= 702 " clean up (see: http://vim.wikia.com/wiki/VimTip396) 291 if version >= 702 " clean up (see: http://vim.wikia.com/wiki/VimTip396)
288 autocmd BufWinLeave * call clearmatches() 292 autocmd BufWinLeave * call clearmatches()
289 endif 293 endif
294
295 menu &UI.&Open\ in\ Serversession
296 \ :execute ":bd<Bar>:call remote_send('GVIM', ':e ' . expand('#:p') . '\<CR\>')"<CR>
297
290endif 298endif
291 299
292 300
@@ -582,10 +590,6 @@ if has("autocmd")
582 1000menu &Tag.stack.jump\ 590 1000menu &Tag.stack.jump\
583 \<Tab>:ta 591 \<Tab>:ta
584 \ :ta 592 \ :ta
585
586 menu &UI.&Open\ in\ Serversession
587 \ :execute ':!nvr --servername /tmp/nvimsocket --remote % +'.line('.')<CR>:stopinsert<CR>:set readonly<CR>
588
589 endif 593 endif
590 594
591 595
..