diff options
Diffstat (limited to 'nvim')
| -rw-r--r-- | nvim/autoload/plug.vim | 5 | ||||
| -rwxr-xr-x | nvim/init.vim | 18 |
2 files changed, 19 insertions, 4 deletions
diff --git a/nvim/autoload/plug.vim b/nvim/autoload/plug.vim index 6a958cb..ad95041 100644 --- a/nvim/autoload/plug.vim +++ b/nvim/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) @@ -1208,7 +1208,8 @@ function! s:update_impl(pull, force, args) abort normal! 2G silent! redraw - let s:clone_opt = [] + " Set remote name, overriding a possible user git config's clone.defaultRemoteName + let s:clone_opt = ['--origin', 'origin'] if get(g:, 'plug_shallow', 1) call extend(s:clone_opt, ['--depth', '1']) if s:git_version_requirement(1, 7, 10) diff --git a/nvim/init.vim b/nvim/init.vim index f540d63..d3f556c 100755 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -82,15 +82,29 @@ else endif " Behaviors exclusive to either the tty or a terminal emulator in a graphical environment +function GetTermPID(temu) + let pinfo = ['', getpid(), ''] + while !(pinfo[2] =~ a:temu) + let pinfo = split(system('ps h -o pid,ppid,command= -p' . pinfo[1])) + endwhile + return pinfo[0] +endfunction + +function SetTermClassName(termpid, name) + silent exec "!settitle " . a:termpid . " " . a:name +endfunction + if empty($DISPLAY) " Clear the tty screen after exiting vim "autocmd QuitPre * :!clear else set cursorline " Highlight current line " Change the terminal emulator's window title and class name to vim + let temu = "st" + let temupid = GetTermPID(temu) autocmd BufEnter * :set title - autocmd VimEnter * :silent exec "!settitle Vim" - autocmd VimLeave * :silent exec "!settitle st" + autocmd VimEnter * call SetTermClassName(temupid, "Vim") + autocmd VimLeave * call SetTermClassName(temupid, "st") "let &titleold="st" endif |