Updated vim plugins

sources_non_forked/vim-gitgutter/autoload/gitgutter.vim

@@ -44,7 +44,7 @@ endfunction
 function! gitgutter#handle_diff(diff) abort
   call gitgutter#debug#log(a:diff)
 
-  call setbufvar(gitgutter#utility#bufnr(), 'gitgutter_tracked', 1)
+  call gitgutter#utility#setbufvar(gitgutter#utility#bufnr(), 'tracked', 1)
 
   call gitgutter#hunk#set_hunks(gitgutter#diff#parse_diff(a:diff))
   let modified_lines = gitgutter#diff#process_hunks(gitgutter#hunk#hunks())
@@ -209,10 +209,16 @@ function! gitgutter#undo_hunk() abort
       call gitgutter#utility#system(gitgutter#utility#command_in_directory_of_file(g:gitgutter_git_executable.' apply --reverse --unidiff-zero - '), diff_for_hunk)
 
       " reload file preserving screen line position
-      let wl = winline()
+      " CTRL-Y and CTRL-E treat negative counts as positive counts.
+      let x = line('w0')
       silent edit
-      let offset = wl - winline()
-      execute "normal! ".offset."\<C-Y>"
+      let y = line('w0')
+      let z = x - y
+      if z > 0
+        execute "normal! ".z."\<C-E>"
+      else
+        execute "normal! ".z."\<C-Y>"
+      endif
     endif
 
     silent! call repeat#set("\<Plug>GitGutterUndoHunk", -1)<CR>

sources_non_forked/vim-gitgutter/autoload/gitgutter/async.vim

@@ -59,11 +59,7 @@ function! gitgutter#async#execute(cmd) abort
     if has('unix')
       let command = ["sh", "-c", a:cmd]
     elseif has('win32')
-      " Help docs recommend {command} be a string on Windows.  But I think
-      " they also say that will run the command directly, which I believe would
-      " mean the redirection and pipe stuff wouldn't work.
-      " let command = "cmd.exe /c ".a:cmd
-      let command = ["cmd.exe", "/c", a:cmd]
+      let command = "cmd.exe /c ".a:cmd
     else
       throw 'unknown os'
     endif
@@ -79,7 +75,7 @@ function! gitgutter#async#execute(cmd) abort
 endfunction
 
 
-function! gitgutter#async#handle_diff_job_nvim(job_id, data, event) abort
+function! gitgutter#async#handle_diff_job_nvim(job_id, data, event) dict abort
   call gitgutter#debug#log('job_id: '.a:job_id.', event: '.a:event.', buffer: '.self.buffer)
 
   let job_bufnr = self.buffer

sources_non_forked/vim-gitgutter/autoload/gitgutter/diff.vim

@@ -56,7 +56,7 @@ function! gitgutter#diff#run_diff(realtime, preserve_full_diff) abort
   let cmd = '('
 
   let bufnr = gitgutter#utility#bufnr()
-  let tracked = getbufvar(bufnr, 'gitgutter_tracked')  " i.e. tracked by git
+  let tracked = gitgutter#utility#getbufvar(bufnr, 'tracked', 0)  " i.e. tracked by git
   if !tracked
     " Don't bother trying to realtime-diff an untracked file.
     " NOTE: perhaps we should pull this guard up to the caller?
@@ -95,6 +95,7 @@ function! gitgutter#diff#run_diff(realtime, preserve_full_diff) abort
   let cmd .= g:gitgutter_git_executable
   if s:c_flag
     let cmd .= ' -c "diff.autorefreshindex=0"'
+    let cmd .= ' -c "diff.noprefix=false"'
   endif
   let cmd .= ' diff --no-ext-diff --no-color -U0 '.g:gitgutter_diff_args.' '
 
@@ -165,7 +166,6 @@ function! gitgutter#diff#parse_hunk(line) abort
 endfunction
 
 function! gitgutter#diff#process_hunks(hunks) abort
-  call gitgutter#hunk#reset()
   let modified_lines = []
   for hunk in a:hunks
     call extend(modified_lines, gitgutter#diff#process_hunk(hunk))

sources_non_forked/vim-gitgutter/autoload/gitgutter/hunk.vim

@@ -1,47 +1,53 @@
-let s:hunks = []
-
 function! gitgutter#hunk#set_hunks(hunks) abort
-  let s:hunks = a:hunks
+  call gitgutter#utility#setbufvar(gitgutter#utility#bufnr(), 'hunks', a:hunks)
+  call s:reset_summary()
 endfunction
 
 function! gitgutter#hunk#hunks() abort
-  return s:hunks
-endfunction
-
-function! gitgutter#hunk#summary(bufnr) abort
-  return get(getbufvar(a:bufnr,''), 'gitgutter_summary', [0,0,0])
+  return gitgutter#utility#getbufvar(gitgutter#utility#bufnr(), 'hunks', [])
 endfunction
 
 function! gitgutter#hunk#reset() abort
-  call setbufvar(gitgutter#utility#bufnr(), 'gitgutter_summary', [0,0,0])
+  call gitgutter#utility#setbufvar(gitgutter#utility#bufnr(), 'hunks', [])
+  call s:reset_summary()
+endfunction
+
+
+function! gitgutter#hunk#summary(bufnr) abort
+  return gitgutter#utility#getbufvar(a:bufnr, 'summary', [0,0,0])
+endfunction
+
+function! s:reset_summary() abort
+  call gitgutter#utility#setbufvar(gitgutter#utility#bufnr(), 'summary', [0,0,0])
 endfunction
 
 function! gitgutter#hunk#increment_lines_added(count) abort
   let bufnr = gitgutter#utility#bufnr()
   let summary = gitgutter#hunk#summary(bufnr)
   let summary[0] += a:count
-  call setbufvar(bufnr, 'gitgutter_summary', summary)
+  call gitgutter#utility#setbufvar(bufnr, 'summary', summary)
 endfunction
 
 function! gitgutter#hunk#increment_lines_modified(count) abort
   let bufnr = gitgutter#utility#bufnr()
   let summary = gitgutter#hunk#summary(bufnr)
   let summary[1] += a:count
-  call setbufvar(bufnr, 'gitgutter_summary', summary)
+  call gitgutter#utility#setbufvar(bufnr, 'summary', summary)
 endfunction
 
 function! gitgutter#hunk#increment_lines_removed(count) abort
   let bufnr = gitgutter#utility#bufnr()
   let summary = gitgutter#hunk#summary(bufnr)
   let summary[2] += a:count
-  call setbufvar(bufnr, 'gitgutter_summary', summary)
+  call gitgutter#utility#setbufvar(bufnr, 'summary', summary)
 endfunction
 
+
 function! gitgutter#hunk#next_hunk(count) abort
   if gitgutter#utility#is_active()
     let current_line = line('.')
     let hunk_count = 0
-    for hunk in s:hunks
+    for hunk in gitgutter#hunk#hunks()
       if hunk[2] > current_line
         let hunk_count += 1
         if hunk_count == a:count
@@ -58,7 +64,7 @@ function! gitgutter#hunk#prev_hunk(count) abort
   if gitgutter#utility#is_active()
     let current_line = line('.')
     let hunk_count = 0
-    for hunk in reverse(copy(s:hunks))
+    for hunk in reverse(copy(gitgutter#hunk#hunks()))
       if hunk[2] < current_line
         let hunk_count += 1
         if hunk_count == a:count
@@ -77,7 +83,7 @@ endfunction
 function! gitgutter#hunk#current_hunk() abort
   let current_hunk = []
 
-  for hunk in s:hunks
+  for hunk in gitgutter#hunk#hunks()
     if gitgutter#hunk#cursor_in_hunk(hunk)
       let current_hunk = hunk
       break
@@ -105,7 +111,7 @@ endfunction
 " be if any changes above it in the file didn't exist.
 function! gitgutter#hunk#line_adjustment_for_current_hunk() abort
   let adj = 0
-  for hunk in s:hunks
+  for hunk in gitgutter#hunk#hunks()
     if gitgutter#hunk#cursor_in_hunk(hunk)
       break
     else

sources_non_forked/vim-gitgutter/autoload/gitgutter/sign.vim

@@ -15,9 +15,9 @@ function! gitgutter#sign#clear_signs() abort
   let bufnr = gitgutter#utility#bufnr()
   call gitgutter#sign#find_current_signs()
 
-  let sign_ids = map(values(getbufvar(bufnr, 'gitgutter_gitgutter_signs')), 'v:val.id')
+  let sign_ids = map(values(gitgutter#utility#getbufvar(bufnr, 'gitgutter_signs')), 'v:val.id')
   call gitgutter#sign#remove_signs(sign_ids, 1)
-  call setbufvar(bufnr, 'gitgutter_gitgutter_signs', {})
+  call gitgutter#utility#setbufvar(bufnr, 'gitgutter_signs', {})
 endfunction
 
 
@@ -47,17 +47,17 @@ endfunction
 
 function! gitgutter#sign#add_dummy_sign() abort
   let bufnr = gitgutter#utility#bufnr()
-  if !getbufvar(bufnr, 'gitgutter_dummy_sign')
+  if !gitgutter#utility#getbufvar(bufnr, 'dummy_sign')
     execute "sign place" s:dummy_sign_id "line=" . 9999 "name=GitGutterDummy buffer=" . bufnr
-    call setbufvar(bufnr, 'gitgutter_dummy_sign', 1)
+    call gitgutter#utility#setbufvar(bufnr, 'dummy_sign', 1)
   endif
 endfunction
 
 function! gitgutter#sign#remove_dummy_sign(force) abort
   let bufnr = gitgutter#utility#bufnr()
-  if getbufvar(bufnr, 'gitgutter_dummy_sign') && (a:force || !g:gitgutter_sign_column_always)
+  if gitgutter#utility#getbufvar(bufnr, 'dummy_sign') && (a:force || !g:gitgutter_sign_column_always)
     execute "sign unplace" s:dummy_sign_id "buffer=" . bufnr
-    call setbufvar(bufnr, 'gitgutter_dummy_sign', 0)
+    call gitgutter#utility#setbufvar(bufnr, 'dummy_sign', 0)
   endif
 endfunction
 
@@ -101,9 +101,9 @@ function! gitgutter#sign#find_current_signs() abort
     end
   endfor
 
-  call setbufvar(bufnr, 'gitgutter_dummy_sign', dummy_sign_placed)
-  call setbufvar(bufnr, 'gitgutter_gitgutter_signs', gitgutter_signs)
-  call setbufvar(bufnr, 'gitgutter_other_signs', other_signs)
+  call gitgutter#utility#setbufvar(bufnr, 'dummy_sign', dummy_sign_placed)
+  call gitgutter#utility#setbufvar(bufnr, 'gitgutter_signs', gitgutter_signs)
+  call gitgutter#utility#setbufvar(bufnr, 'other_signs', other_signs)
 endfunction
 
 
@@ -113,7 +113,7 @@ function! gitgutter#sign#obsolete_gitgutter_signs_to_remove(new_gitgutter_signs_
   let bufnr = gitgutter#utility#bufnr()
   let signs_to_remove = []  " list of [<id (number)>, ...]
   let remove_all_signs = 1
-  let old_gitgutter_signs = getbufvar(bufnr, 'gitgutter_gitgutter_signs')
+  let old_gitgutter_signs = gitgutter#utility#getbufvar(bufnr, 'gitgutter_signs')
   for line_number in keys(old_gitgutter_signs)
     if index(a:new_gitgutter_signs_line_numbers, str2nr(line_number)) == -1
       call add(signs_to_remove, old_gitgutter_signs[line_number].id)
@@ -128,8 +128,8 @@ endfunction
 
 function! gitgutter#sign#remove_signs(sign_ids, all_signs) abort
   let bufnr = gitgutter#utility#bufnr()
-  if a:all_signs && s:supports_star && empty(getbufvar(bufnr, 'gitgutter_other_signs'))
-    let dummy_sign_present = getbufvar(bufnr, 'gitgutter_dummy_sign')
+  if a:all_signs && s:supports_star && empty(gitgutter#utility#getbufvar(bufnr, 'other_signs'))
+    let dummy_sign_present = gitgutter#utility#getbufvar(bufnr, 'dummy_sign')
     execute "sign unplace * buffer=" . bufnr
     if dummy_sign_present
       execute "sign place" s:dummy_sign_id "line=" . 9999 "name=GitGutterDummy buffer=" . bufnr
@@ -144,8 +144,8 @@ endfunction
 
 function! gitgutter#sign#upsert_new_gitgutter_signs(modified_lines) abort
   let bufnr = gitgutter#utility#bufnr()
-  let other_signs         = getbufvar(bufnr, 'gitgutter_other_signs')
-  let old_gitgutter_signs = getbufvar(bufnr, 'gitgutter_gitgutter_signs')
+  let other_signs         = gitgutter#utility#getbufvar(bufnr, 'other_signs')
+  let old_gitgutter_signs = gitgutter#utility#getbufvar(bufnr, 'gitgutter_signs')
 
   for line in a:modified_lines
     let line_number = line[0]  " <number>

sources_non_forked/vim-gitgutter/autoload/gitgutter/utility.vim

@@ -2,6 +2,23 @@ let s:file = ''
 let s:using_xolox_shell = -1
 let s:exit_code = 0
 
+function! gitgutter#utility#setbufvar(buffer, varname, val)
+  let dict = get(getbufvar(a:buffer, ''), 'gitgutter', {})
+  let dict[a:varname] = a:val
+  call setbufvar(a:buffer, 'gitgutter', dict)
+endfunction
+
+function! gitgutter#utility#getbufvar(buffer, varname, ...)
+  let dict = get(getbufvar(a:buffer, ''), 'gitgutter', {})
+  if has_key(dict, a:varname)
+    return dict[a:varname]
+  else
+    if a:0
+      return a:1
+    endif
+  endif
+endfunction
+
 function! gitgutter#utility#warn(message) abort
   echohl WarningMsg
   echo 'vim-gitgutter: ' . a:message
@@ -10,8 +27,8 @@ function! gitgutter#utility#warn(message) abort
 endfunction
 
 function! gitgutter#utility#warn_once(message, key) abort
-  if empty(getbufvar(s:bufnr, a:key))
-    call setbufvar(s:bufnr, a:key, '1')
+  if empty(gitgutter#utility#getbufvar(s:bufnr, a:key))
+    call gitgutter#utility#setbufvar(s:bufnr, a:key, '1')
     echohl WarningMsg
     redraw | echo 'vim-gitgutter: ' . a:message
     echohl None
@@ -92,11 +109,11 @@ function! gitgutter#utility#has_unsaved_changes() abort
 endfunction
 
 function! gitgutter#utility#has_fresh_changes() abort
-  return getbufvar(s:bufnr, 'changedtick') != getbufvar(s:bufnr, 'gitgutter_last_tick')
+  return getbufvar(s:bufnr, 'changedtick') != gitgutter#utility#getbufvar(s:bufnr, 'last_tick')
 endfunction
 
 function! gitgutter#utility#save_last_seen_change() abort
-  call setbufvar(s:bufnr, 'gitgutter_last_tick', getbufvar(s:bufnr, 'changedtick'))
+  call gitgutter#utility#setbufvar(s:bufnr, 'last_tick', getbufvar(s:bufnr, 'changedtick'))
 endfunction
 
 function! gitgutter#utility#shell_error() abort
@@ -136,12 +153,12 @@ function! gitgutter#utility#system(cmd, ...) abort
 endfunction
 
 function! gitgutter#utility#file_relative_to_repo_root() abort
-  let file_path_relative_to_repo_root = getbufvar(s:bufnr, 'gitgutter_repo_relative_path')
+  let file_path_relative_to_repo_root = gitgutter#utility#getbufvar(s:bufnr, 'repo_relative_path')
   if empty(file_path_relative_to_repo_root)
     let dir_path_relative_to_repo_root = gitgutter#utility#system(gitgutter#utility#command_in_directory_of_file(g:gitgutter_git_executable.' rev-parse --show-prefix'))
     let dir_path_relative_to_repo_root = gitgutter#utility#strip_trailing_new_line(dir_path_relative_to_repo_root)
     let file_path_relative_to_repo_root = dir_path_relative_to_repo_root . gitgutter#utility#filename()
-    call setbufvar(s:bufnr, 'gitgutter_repo_relative_path', file_path_relative_to_repo_root)
+    call gitgutter#utility#setbufvar(s:bufnr, 'repo_relative_path', file_path_relative_to_repo_root)
   endif
   return file_path_relative_to_repo_root
 endfunction
@@ -174,14 +191,10 @@ function! gitgutter#utility#strip_trailing_new_line(line) abort
   return substitute(a:line, '\n$', '', '')
 endfunction
 
-function! gitgutter#utility#git_version() abort
-  return matchstr(system(g:gitgutter_git_executable.' --version'), '[0-9.]\+')
-endfunction
-
 " True for git v1.7.2+.
 function! gitgutter#utility#git_supports_command_line_config_override() abort
-  let [major, minor, patch; _] = split(gitgutter#utility#git_version(), '\.')
-  return major > 1 || (major == 1 && minor > 7) || (minor == 7 && patch > 1)
+  call system(g:gitgutter_git_executable.' -c foo.bar=baz --version')
+  return !v:shell_error
 endfunction
 
 function! gitgutter#utility#stringify(list) abort