From 68daba631f97edf25cf1495a7a75369eac137617 Mon Sep 17 00:00:00 2001
From: Andre Stemmet <andre.stemmet@jci.com>
Date: Tue, 26 Mar 2019 15:30:26 +0000
Subject: [PATCH] WIP 2019-03-26T15:30:26+00:00

---
 oh-my-zsh                                  |  2 +-
 vim/autoload/plug.vim                      | 22 ++++++++++++++++++----
 zsh-custom/plugins/zsh-syntax-highlighting |  2 +-
 zshrc                                      |  4 +++-
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/oh-my-zsh b/oh-my-zsh
index dfd1b4f..8fba503 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit dfd1b4f8dfe977016bfe0ecd0fc360a526252827
+Subproject commit 8fba503667a477b544bfd1fa33e75430874e228a
diff --git a/vim/autoload/plug.vim b/vim/autoload/plug.vim
index 5d2b00e..4e05630 100644
--- a/vim/autoload/plug.vim
+++ b/vim/autoload/plug.vim
@@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...)
   endtry
 endfunction
 
+function! s:lazy(plug, opt)
+  return has_key(a:plug, a:opt) &&
+        \ (empty(s:to_a(a:plug[a:opt]))         ||
+        \  !isdirectory(a:plug.dir)             ||
+        \  len(s:glob(s:rtp(a:plug), 'plugin')) ||
+        \  len(s:glob(s:rtp(a:plug), 'after/plugin')))
+endfunction
+
 function! plug#end()
   if !exists('g:plugs')
     return s:err('Call plug#begin() first')
@@ -214,7 +222,7 @@ function! plug#end()
       continue
     endif
     let plug = g:plugs[name]
-    if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
+    if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
       let s:loaded[name] = 1
       continue
     endif
@@ -1011,6 +1019,8 @@ function! s:update_impl(pull, force, args) abort
     let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
   endif
 
+  let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
+
   " Python version requirement (>= 2.7)
   if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
     redir => pyv
@@ -1102,7 +1112,7 @@ function! s:update_finish()
       if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
             \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
         call s:log4(name, 'Updating submodules. This may take a while.')
-        let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir)
+        let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
       endif
       let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
       if v:shell_error
@@ -1321,7 +1331,7 @@ while 1 " Without TCO, Vim stack is bound to explode
 
   let name = keys(s:update.todo)[0]
   let spec = remove(s:update.todo, name)
-  let new  = !isdirectory(spec.dir)
+  let new  = empty(globpath(spec.dir, '.git', 1))
 
   call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
   redraw
@@ -2410,7 +2420,11 @@ function! s:diff()
     call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
     for [k, v] in plugs
       let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
-      let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir)
+      let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
+      if has_key(v, 'rtp')
+        let cmd .= ' -- '.s:shellesc(v.rtp)
+      endif
+      let diff = s:system_chomp(cmd, v.dir)
       if !empty(diff)
         let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
         call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
diff --git a/zsh-custom/plugins/zsh-syntax-highlighting b/zsh-custom/plugins/zsh-syntax-highlighting
index d61ebbc..a109ab5 160000
--- a/zsh-custom/plugins/zsh-syntax-highlighting
+++ b/zsh-custom/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit d61ebbcbbf7da8fc35040f591e37b89272623036
+Subproject commit a109ab54f0d95744c3321183011484ba1de805a7
diff --git a/zshrc b/zshrc
index f7e2488..a659ba2 100755
--- a/zshrc
+++ b/zshrc
@@ -165,7 +165,9 @@ export LANG=en_US.UTF-8
 
 # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
-export EDITOR='vim'
+( which vi 2>/dev/null >/dev/null ) && export EDITOR='vi'
+( which vim 2>/dev/null >/dev/null ) && export EDITOR='vim'
+( which nvim 2>/dev/null >/dev/null ) && export EDITOR='nvim'
 # else
 #   export EDITOR='mvim'
 # fi