More option tweaking

.vim/autoload/plug.vim

@@ -74,7 +74,7 @@ let s:mac_gui = has('gui_macvim') && has('gui_running')
 let s:is_win = has('win32') || has('win64')
 let s:py2 = has('python') && !has('nvim') && !s:is_win && !has('win32unix')
 let s:ruby = has('ruby') && !has('nvim') && (v:version >= 703 || v:version == 702 && has('patch374'))
-let s:nvim = has('nvim') && !exists('##JobActivity') && !s:is_win
+let s:nvim = has('nvim') && exists('*jobwait') && !s:is_win
 let s:me = resolve(expand('<sfile>:p'))
 let s:base_spec = { 'branch': 'master', 'frozen': 0 }
 let s:TYPE = {
@@ -165,7 +165,7 @@ function! plug#end()
     if has_key(plug, 'on')
       let s:triggers[name] = { 'map': [], 'cmd': [] }
       for cmd in s:to_a(plug.on)
-        if cmd =~ '^<Plug>.\+'
+        if cmd =~? '^<Plug>.\+'
           if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i'))
             call s:assoc(lod.map, cmd, name)
           endif
@@ -270,7 +270,7 @@ if s:is_win
   endfunction
 
   function! s:is_local_plug(repo)
-    return a:repo =~? '^[a-z]:'
+    return a:repo =~? '^[a-z]:\|^[%~]'
   endfunction
 else
   function! s:rtp(spec)
@@ -740,6 +740,12 @@ function! s:update_impl(pull, force, args) abort
     endtry
   endif
 
+  if has('nvim') && !exists('*jobwait') && threads > 1
+    echohl WarningMsg
+    echomsg 'vim-plug: update Neovim for parallel installer'
+    echohl None
+  endif
+
   let s:update = {
     \ 'start':   reltime(),
     \ 'all':     todo,

.vim/options.vim

@@ -10,7 +10,6 @@ set autowrite
 set background=dark
 set backspace=indent,eol,start
 set completeopt-=preview
-set cursorline
 set encoding=utf-8
 set expandtab
 set fileformats=unix,dos,mac
@@ -38,7 +37,6 @@ set shortmess+=I
 set smartcase
 set smartcase
 set smarttab
-set t_Co=246
 set tabstop=4
 set ttyfast
 set wildmenu
@@ -46,6 +44,7 @@ set wrapmargin=1
 
 if has('gui_running')
     set columns=150
+    set cursorline
     set guioptions-=L
     set guioptions-=R
     set guioptions-=T