diff --git a/sources_non_forked/ale/ale_linters/eruby/erblint.vim b/sources_non_forked/ale/ale_linters/eruby/erblint.vim
new file mode 100644
index 00000000..19960185
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/eruby/erblint.vim
@@ -0,0 +1,51 @@
+" Author: Roeland Moors - https://github.com/roelandmoors
+" based on the ale ruumba and robocop linters
+" Description: ERB Lint, support for https://github.com/Shopify/erb-lint
+
+call ale#Set('eruby_erblint_executable', 'erblint')
+call ale#Set('eruby_erblint_options', '')
+
+function! ale_linters#eruby#erblint#GetCommand(buffer) abort
+    let l:executable = ale#Var(a:buffer, 'eruby_erblint_executable')
+
+    return ale#ruby#EscapeExecutable(l:executable, 'erblint')
+    \   . ' --format json '
+    \   . ale#Var(a:buffer, 'eruby_erblint_options')
+    \   . ' --stdin %s'
+endfunction
+
+function! ale_linters#eruby#erblint#Handle(buffer, lines) abort
+    if empty(a:lines)
+        return []
+    endif
+
+    let l:errors = ale#util#FuzzyJSONDecode(a:lines[0], [])
+
+    if !has_key(l:errors, 'summary')
+    \|| l:errors['summary']['offenses'] == 0
+    \|| empty(l:errors['files'])
+        return []
+    endif
+
+    let l:output = []
+
+    for l:error in l:errors['files'][0]['offenses']
+        call add(l:output, {
+        \   'lnum': l:error['location']['start_line'] + 0,
+        \   'col': l:error['location']['start_column'] + 0,
+        \   'end_col': l:error['location']['last_column'] + 0,
+        \   'code': l:error['linter'],
+        \   'text': l:error['message'],
+        \   'type': 'W',
+        \})
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('eruby', {
+\   'name': 'erblint',
+\   'executable': {b -> ale#Var(b, 'eruby_erblint_executable')},
+\   'command': function('ale_linters#eruby#erblint#GetCommand'),
+\   'callback': 'ale_linters#eruby#erblint#Handle',
+\})
diff --git a/sources_non_forked/ale/ale_linters/javascript/deno.vim b/sources_non_forked/ale/ale_linters/javascript/deno.vim
new file mode 100644
index 00000000..659eb855
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/javascript/deno.vim
@@ -0,0 +1,11 @@
+" Author: Arnold Chand <creativenull@outlook.com>
+" Description: Deno lsp linter for JavaScript files.
+
+call ale#linter#Define('javascript', {
+\   'name': 'deno',
+\   'lsp': 'stdio',
+\   'executable': function('ale#handlers#deno#GetExecutable'),
+\   'command': '%e lsp',
+\   'project_root': function('ale#handlers#deno#GetProjectRoot'),
+\   'initialization_options': function('ale#handlers#deno#GetInitializationOptions'),
+\})
diff --git a/sources_non_forked/ale/ale_linters/json/eslint.vim b/sources_non_forked/ale/ale_linters/json/eslint.vim
new file mode 100644
index 00000000..bdabb9fa
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/json/eslint.vim
@@ -0,0 +1,16 @@
+" Author: João Pesce <joao@pesce.cc>
+" Description: eslint for JSON files.
+"
+" Requires eslint-plugin-jsonc or a similar plugin to work
+"
+" Uses the same funtcions as ale_linters/javascript/eslint.vim by w0rp
+" <devw0rp@gmail.com>
+
+call ale#linter#Define('json', {
+\   'name': 'eslint',
+\   'output_stream': 'both',
+\   'executable': function('ale#handlers#eslint#GetExecutable'),
+\   'cwd': function('ale#handlers#eslint#GetCwd'),
+\   'command': function('ale#handlers#eslint#GetCommand'),
+\   'callback': 'ale#handlers#eslint#HandleJSON',
+\})
diff --git a/sources_non_forked/ale/ale_linters/json5/eslint.vim b/sources_non_forked/ale/ale_linters/json5/eslint.vim
new file mode 100644
index 00000000..6207f2d7
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/json5/eslint.vim
@@ -0,0 +1,16 @@
+" Author: João Pesce <joao@pesce.cc>
+" Description: eslint for JSON5 files.
+"
+" Requires eslint-plugin-jsonc or a similar plugin to work
+"
+" Uses the same funtcions as ale_linters/javascript/eslint.vim by w0rp
+" <devw0rp@gmail.com>
+
+call ale#linter#Define('json5', {
+\   'name': 'eslint',
+\   'output_stream': 'both',
+\   'executable': function('ale#handlers#eslint#GetExecutable'),
+\   'cwd': function('ale#handlers#eslint#GetCwd'),
+\   'command': function('ale#handlers#eslint#GetCommand'),
+\   'callback': 'ale#handlers#eslint#HandleJSON',
+\})
diff --git a/sources_non_forked/ale/ale_linters/jsonc/eslint.vim b/sources_non_forked/ale/ale_linters/jsonc/eslint.vim
new file mode 100644
index 00000000..1a5cc528
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/jsonc/eslint.vim
@@ -0,0 +1,16 @@
+" Author: João Pesce <joao@pesce.cc>
+" Description: eslint for JSONC files.
+"
+" Requires eslint-plugin-jsonc or a similar plugin to work
+"
+" Uses the same funtcions as ale_linters/javascript/eslint.vim by w0rp
+" <devw0rp@gmail.com>
+
+call ale#linter#Define('jsonc', {
+\   'name': 'eslint',
+\   'output_stream': 'both',
+\   'executable': function('ale#handlers#eslint#GetExecutable'),
+\   'cwd': function('ale#handlers#eslint#GetCwd'),
+\   'command': function('ale#handlers#eslint#GetCommand'),
+\   'callback': 'ale#handlers#eslint#HandleJSON',
+\})
diff --git a/sources_non_forked/ale/ale_linters/jsonnet/jsonnet_lint.vim b/sources_non_forked/ale/ale_linters/jsonnet/jsonnet_lint.vim
new file mode 100644
index 00000000..a5ebdc39
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/jsonnet/jsonnet_lint.vim
@@ -0,0 +1,59 @@
+" Author: Trevor Whitney <trevorjwhitney@gmail.com>
+" Description: jsonnet-lint for jsonnet files
+
+call ale#Set('jsonnet_jsonnet_lint_executable', 'jsonnet-lint')
+call ale#Set('jsonnet_jsonnet_lint_options', '')
+
+function! ale_linters#jsonnet#jsonnet_lint#GetCommand(buffer) abort
+    let l:options = ale#Var(a:buffer, 'jsonnet_jsonnet_lint_options')
+
+    return '%e'
+    \   . ale#Pad(l:options)
+    \   . ' %t'
+endfunction
+
+
+function! ale_linters#jsonnet#jsonnet_lint#Handle(buffer, lines) abort
+    " Matches patterns line the following:
+    "
+    " ERROR: foo.jsonnet:22:3-12 expected token OPERATOR but got (IDENTIFIER, "bar")
+    " ERROR: hoge.jsonnet:20:3 unexpected: "}" while parsing terminal
+    " ERROR: main.jsonnet:212:1-14 Expected , or ; but got (IDENTIFIER, "older_cluster")
+    let l:pattern = '^ERROR: [^:]*:\(\d\+\):\(\d\+\)\(-\d\+\)* \(.*\)'
+    let l:output = []
+
+    for l:line in a:lines
+        let l:match = matchlist(l:line, l:pattern)
+
+        if len(l:match) == 0
+            continue
+        endif
+
+        let line_number = l:match[1] + 0
+        let column = l:match[2] + 0
+        " l:match[3] has optional -14, when linter is showing a range
+        let text = l:match[4]
+
+
+        " vcol is Needed to indicate that the column is a character.
+        call add(l:output, {
+        \   'bufnr': a:buffer,
+        \   'lnum': line_number,
+        \   'vcol': 0,
+        \   'col': column,
+        \   'text': text,
+        \   'type': 'E',
+        \   'nr': -1,
+        \})
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('jsonnet', {
+\   'name': 'jsonnet_lint',
+\   'output_stream': 'stderr',
+\   'executable': {b -> ale#Var(b, 'jsonnet_jsonnet_lint_executable')},
+\   'command': function('ale_linters#jsonnet#jsonnet_lint#GetCommand'),
+\   'callback': 'ale_linters#jsonnet#jsonnet_lint#Handle',
+\})
diff --git a/sources_non_forked/ale/ale_linters/jsonnet/jsonnetfmt.vim b/sources_non_forked/ale/ale_linters/jsonnet/jsonnetfmt.vim
new file mode 100644
index 00000000..8904019e
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/jsonnet/jsonnetfmt.vim
@@ -0,0 +1,52 @@
+" Authors: Trevor Whitney <trevorjwhitney@gmail.com> and Takuya Kosugiyama <re@itkq.jp>
+" Description: jsonnetfmt for jsonnet files
+
+call ale#Set('jsonnet_jsonnetfmt_executable', 'jsonnetfmt')
+call ale#Set('jsonnet_jsonnetfmt_options', '')
+
+function! ale_linters#jsonnet#jsonnetfmt#GetCommand(buffer) abort
+    let l:options = ale#Var(a:buffer, 'jsonnet_jsonnetfmt_options')
+
+    return '%e'
+    \   . ale#Pad(l:options)
+    \   . ' %t'
+endfunction
+
+
+function! ale_linters#jsonnet#jsonnetfmt#Handle(buffer, lines) abort
+    " Matches patterns line the following:
+    "
+    " STATIC ERROR: foo.jsonnet:22:3-12: expected token OPERATOR but got (IDENTIFIER, "bar")
+    " STATIC ERROR: hoge.jsonnet:20:3: unexpected: "}" while parsing terminal
+    let l:pattern = '^STATIC ERROR:[^:]*:\(\d\+\):\(\d\+\):*\(-\d\+\)* \(.*\)'
+    let l:output = []
+
+    for l:line in a:lines
+        let l:match = matchlist(l:line, l:pattern)
+
+        if len(l:match) == 0
+            continue
+        endif
+
+        " vcol is Needed to indicate that the column is a character.
+        call add(l:output, {
+        \   'bufnr': a:buffer,
+        \   'lnum': l:match[1] + 0,
+        \   'vcol': 0,
+        \   'col': l:match[2] + 0,
+        \   'text': l:match[4],
+        \   'type': 'E',
+        \   'nr': -1,
+        \})
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('jsonnet', {
+\   'name': 'jsonnetfmt',
+\   'output_stream': 'stderr',
+\   'executable': {b -> ale#Var(b, 'jsonnet_jsonnetfmt_executable')},
+\   'command': function('ale_linters#jsonnet#jsonnetfmt#GetCommand'),
+\   'callback': 'ale_linters#jsonnet#jsonnetfmt#Handle',
+\})
diff --git a/sources_non_forked/ale/ale_linters/mail/languagetool.vim b/sources_non_forked/ale/ale_linters/mail/languagetool.vim
index 330fb8ec..f68dab7a 100644
--- a/sources_non_forked/ale/ale_linters/mail/languagetool.vim
+++ b/sources_non_forked/ale/ale_linters/mail/languagetool.vim
@@ -1,4 +1,4 @@
-" Author: Vincent (wahrwolf [ät] wolfpit.net)
+" Author: Vincent (wahrwolf [at] wolfpit.net)
 " Description: languagetool for mails
 
 
diff --git a/sources_non_forked/ale/ale_linters/markdown/languagetool.vim b/sources_non_forked/ale/ale_linters/markdown/languagetool.vim
index d6bca22e..422a38c3 100644
--- a/sources_non_forked/ale/ale_linters/markdown/languagetool.vim
+++ b/sources_non_forked/ale/ale_linters/markdown/languagetool.vim
@@ -1,4 +1,4 @@
-" Author: Vincent (wahrwolf [ät] wolfpit.net)
+" Author: Vincent (wahrwolf [at] wolfpit.net)
 " Description: languagetool for markdown files
 
 
diff --git a/sources_non_forked/ale/ale_linters/python/flakehell.vim b/sources_non_forked/ale/ale_linters/python/flakehell.vim
new file mode 100644
index 00000000..ffe87e29
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/python/flakehell.vim
@@ -0,0 +1,175 @@
+" Author: w0rp <devw0rp@gmail.com>
+" Description: flakehell for python files
+
+call ale#Set('python_flakehell_executable', 'flakehell')
+call ale#Set('python_flakehell_options', '')
+call ale#Set('python_flakehell_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('python_flakehell_change_directory', 'project')
+call ale#Set('python_flakehell_auto_pipenv', 0)
+call ale#Set('python_flakehell_auto_poetry', 0)
+
+function! s:UsingModule(buffer) abort
+    return ale#Var(a:buffer, 'python_flakehell_executable') is? 'python'
+endfunction
+
+function! ale_linters#python#flakehell#GetExecutable(buffer) abort
+    if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_flakehell_auto_pipenv'))
+    \ && ale#python#PipenvPresent(a:buffer)
+        return 'pipenv'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_poetry') || ale#Var(a:buffer, 'python_flakehell_auto_poetry'))
+    \ && ale#python#PoetryPresent(a:buffer)
+        return 'poetry'
+    endif
+
+    if !s:UsingModule(a:buffer)
+        return ale#python#FindExecutable(a:buffer, 'python_flakehell', ['flakehell'])
+    endif
+
+    return ale#Var(a:buffer, 'python_flakehell_executable')
+endfunction
+
+function! ale_linters#python#flakehell#RunWithVersionCheck(buffer) abort
+    let l:executable = ale_linters#python#flakehell#GetExecutable(a:buffer)
+
+    let l:module_string = s:UsingModule(a:buffer) ? ' -m flakehell' : ''
+    let l:command = ale#Escape(l:executable) . l:module_string . ' --version'
+
+    return ale#semver#RunWithVersionCheck(
+    \   a:buffer,
+    \   l:executable,
+    \   l:command,
+    \   function('ale_linters#python#flakehell#GetCommand'),
+    \)
+endfunction
+
+function! ale_linters#python#flakehell#GetCwd(buffer) abort
+    let l:change_directory = ale#Var(a:buffer, 'python_flakehell_change_directory')
+    let l:cwd = ''
+
+    if l:change_directory is# 'project'
+        let l:project_root = ale#python#FindProjectRootIni(a:buffer)
+
+        if !empty(l:project_root)
+            let l:cwd = l:project_root
+        endif
+    endif
+
+    if (l:change_directory is# 'project' && empty(l:cwd))
+    \|| l:change_directory is# 1
+    \|| l:change_directory is# 'file'
+        let l:cwd = '%s:h'
+    endif
+
+    return l:cwd
+endfunction
+
+function! ale_linters#python#flakehell#GetCommand(buffer, version) abort
+    let l:executable = ale_linters#python#flakehell#GetExecutable(a:buffer)
+
+    if (l:executable =~? 'pipenv\|poetry$')
+        let l:exec_args = ' run flakehell'
+    elseif (l:executable is? 'python')
+        let l:exec_args = ' -m flakehell'
+    else
+        let l:exec_args = ''
+    endif
+
+    " Only include the --stdin-display-name argument if we can parse the
+    " flakehell version, and it is recent enough to support it.
+    let l:display_name_args = ale#semver#GTE(a:version, [0, 8, 0])
+    \   ? ' --stdin-display-name %s'
+    \   : ''
+
+    let l:options = ale#Var(a:buffer, 'python_flakehell_options')
+
+    return ale#Escape(l:executable)
+    \   . l:exec_args
+    \   . (!empty(l:options) ? ' lint ' . l:options : ' lint')
+    \   . ' --format=default'
+    \   . l:display_name_args . ' -'
+endfunction
+
+let s:end_col_pattern_map = {
+\   'F405': '\(.\+\) may be undefined',
+\   'F821': 'undefined name ''\([^'']\+\)''',
+\   'F999': '^''\([^'']\+\)''',
+\   'F841': 'local variable ''\([^'']\+\)''',
+\}
+
+function! ale_linters#python#flakehell#Handle(buffer, lines) abort
+    let l:output = ale#python#HandleTraceback(a:lines, 10)
+
+    if !empty(l:output)
+        return l:output
+    endif
+
+    " Matches patterns line the following:
+    "
+    " Matches patterns line the following:
+    "
+    " stdin:6:6: E111 indentation is not a multiple of four
+    let l:pattern = '\v^[a-zA-Z]?:?[^:]+:(\d+):?(\d+)?: ([[:alnum:]]+):? (.*)$'
+
+    for l:match in ale#util#GetMatches(a:lines, l:pattern)
+        let l:code = l:match[3]
+
+        if (l:code is# 'W291' || l:code is# 'W293')
+        \ && !ale#Var(a:buffer, 'warn_about_trailing_whitespace')
+            " Skip warnings for trailing whitespace if the option is off.
+            continue
+        endif
+
+        if l:code is# 'W391'
+        \&& !ale#Var(a:buffer, 'warn_about_trailing_blank_lines')
+            " Skip warnings for trailing blank lines if the option is off
+            continue
+        endif
+
+        let l:item = {
+        \   'lnum': l:match[1] + 0,
+        \   'col': l:match[2] + 0,
+        \   'vcol': 1,
+        \   'text': l:match[4],
+        \   'code': l:code,
+        \   'type': 'W',
+        \}
+
+        if l:code[:0] is# 'F'
+            if l:code isnot# 'F401'
+                let l:item.type = 'E'
+            endif
+        elseif l:code[:0] is# 'E'
+            let l:item.type = 'E'
+
+            if l:code isnot# 'E999' && l:code isnot# 'E112'
+                let l:item.sub_type = 'style'
+            endif
+        elseif l:code[:0] is# 'W'
+            let l:item.sub_type = 'style'
+        endif
+
+        let l:end_col_pattern = get(s:end_col_pattern_map, l:code, '')
+
+        if !empty(l:end_col_pattern)
+            let l:end_col_match = matchlist(l:match[4], l:end_col_pattern)
+
+            if !empty(l:end_col_match)
+                let l:item.end_col = l:item.col + len(l:end_col_match[1]) - 1
+            endif
+        endif
+
+        call add(l:output, l:item)
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('python', {
+\   'name': 'flakehell',
+\   'executable': function('ale_linters#python#flakehell#GetExecutable'),
+\   'cwd': function('ale_linters#python#flakehell#GetCwd'),
+\   'command': function('ale_linters#python#flakehell#RunWithVersionCheck'),
+\   'callback': 'ale_linters#python#flakehell#Handle',
+\})
diff --git a/sources_non_forked/ale/ale_linters/python/pyre.vim b/sources_non_forked/ale/ale_linters/python/pyre.vim
index d9b46763..5e5786f9 100644
--- a/sources_non_forked/ale/ale_linters/python/pyre.vim
+++ b/sources_non_forked/ale/ale_linters/python/pyre.vim
@@ -22,14 +22,17 @@ endfunction
 
 function! ale_linters#python#pyre#GetCommand(buffer) abort
     let l:executable = ale_linters#python#pyre#GetExecutable(a:buffer)
-
-    let l:exec_args = l:executable =~? 'pipenv\|poetry$'
-    \   ? ' run pyre persistent'
-    \   : ' persistent'
+    let l:exec_args = (l:executable =~? 'pipenv\|poetry$' ? ' run pyre' : '') . ' persistent'
 
     return ale#Escape(l:executable) . l:exec_args
 endfunction
 
+function! ale_linters#python#pyre#GetCwd(buffer) abort
+    let l:local_config = ale#path#FindNearestFile(a:buffer, '.pyre_configuration.local')
+
+    return fnamemodify(l:local_config, ':h')
+endfunction
+
 call ale#linter#Define('python', {
 \   'name': 'pyre',
 \   'lsp': 'stdio',
@@ -37,4 +40,5 @@ call ale#linter#Define('python', {
 \   'command': function('ale_linters#python#pyre#GetCommand'),
 \   'project_root': function('ale#python#FindProjectRoot'),
 \   'completion_filter': 'ale#completion#python#CompletionItemFilter',
+\   'cwd': function('ale_linters#python#pyre#GetCwd'),
 \})
diff --git a/sources_non_forked/ale/ale_linters/robot/rflint.vim b/sources_non_forked/ale/ale_linters/robot/rflint.vim
new file mode 100644
index 00000000..8fe2d797
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/robot/rflint.vim
@@ -0,0 +1,46 @@
+" Author: Samuel Branisa <branisa.samuel@icloud.com>
+" Description: rflint linting for robot framework files
+
+call ale#Set('robot_rflint_executable', 'rflint')
+
+function! ale_linters#robot#rflint#GetExecutable(buffer) abort
+    return ale#Var(a:buffer, 'robot_rflint_executable')
+endfunction
+
+function! ale_linters#robot#rflint#GetCommand(buffer) abort
+    let l:executable = ale_linters#robot#rflint#GetExecutable(a:buffer)
+    let l:flags = '--format'
+    \ . ' "{filename}:{severity}:{linenumber}:{char}:{rulename}:{message}"'
+
+    return l:executable
+    \   . ' '
+    \   . l:flags
+    \   . ' %s'
+endfunction
+
+function! ale_linters#robot#rflint#Handle(buffer, lines) abort
+    let l:pattern = '\v^([[:alnum:][:punct:]]+):(W|E):([[:digit:]]+):([[:digit:]]+):([[:alnum:]]+):(.*)$'
+    let l:output = []
+
+    for l:match in ale#util#GetMatches(a:lines, l:pattern)
+        call add(l:output, {
+        \   'bufnr': a:buffer,
+        \   'filename': l:match[1],
+        \   'type': l:match[2],
+        \   'lnum': str2nr(l:match[3]),
+        \   'col': str2nr(l:match[4]),
+        \   'text': l:match[5],
+        \   'detail': l:match[6],
+        \})
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('robot', {
+\   'name': 'rflint',
+\   'executable': function('ale_linters#robot#rflint#GetExecutable'),
+\   'command': function('ale_linters#robot#rflint#GetCommand'),
+\   'callback': 'ale_linters#robot#rflint#Handle',
+\})
+
diff --git a/sources_non_forked/ale/ale_linters/thrift/thriftcheck.vim b/sources_non_forked/ale/ale_linters/thrift/thriftcheck.vim
index 7b8cbee1..bf929d10 100644
--- a/sources_non_forked/ale/ale_linters/thrift/thriftcheck.vim
+++ b/sources_non_forked/ale/ale_linters/thrift/thriftcheck.vim
@@ -13,9 +13,9 @@ endfunction
 function! ale_linters#thrift#thriftcheck#Handle(buffer, lines) abort
     " Matches lines like the following:
     "
-    " file.thrift:1:1:error: "py" namespace must match "^idl\\." (namespace.pattern)
-    " file.thrift:3:5:warning: 64-bit integer constant -2147483649 may not work in all languages (int.64bit)
-    let l:pattern = '\v^[a-zA-Z]?:?[^:]+:(\d+):(\d+):(\l+): (.*) \((.*)\)$'
+    " file.thrift:1:1: error: "py" namespace must match "^idl\\." (namespace.pattern)
+    " file.thrift:3:5: warning: 64-bit integer constant -2147483649 may not work in all languages (int.64bit)
+    let l:pattern = '\v^[a-zA-Z]?:?[^:]+:(\d+):(\d+): ?([^:]+): (.+) \(([^\)]+)\)$'
 
     let l:output = []
 
diff --git a/sources_non_forked/ale/ale_linters/yaml/circleci.vim b/sources_non_forked/ale/ale_linters/yaml/circleci.vim
index 3df61459..20835454 100644
--- a/sources_non_forked/ale/ale_linters/yaml/circleci.vim
+++ b/sources_non_forked/ale/ale_linters/yaml/circleci.vim
@@ -28,7 +28,7 @@ endfunction
 call ale#linter#Define('yaml', {
 \   'name': 'circleci',
 \   'executable': {b -> expand('#' . b . ':p') =~? '\.circleci' ? 'circleci' : ''},
-\   'command': 'circleci config validate - < %s',
+\   'command': 'circleci --skip-update-check config validate - < %s',
 \   'callback': 'ale_linters#yaml#circleci#Handle',
 \   'output_stream': 'stderr',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/autoload/ale/codefix.vim b/sources_non_forked/ale/autoload/ale/codefix.vim
index 4a78063b..853ee4e8 100644
--- a/sources_non_forked/ale/autoload/ale/codefix.vim
+++ b/sources_non_forked/ale/autoload/ale/codefix.vim
@@ -201,6 +201,14 @@ function! ale#codefix#ApplyLSPCodeAction(data, item) abort
         \   l:command.arguments,
         \)
 
+        let l:request_id = ale#lsp#Send(a:data.connection_id, l:message)
+    elseif has_key(a:item, 'command') && has_key(a:item, 'arguments')
+    \&& type(a:item.command) == v:t_string
+        let l:message = ale#lsp#message#ExecuteCommand(
+        \   a:item.command,
+        \   a:item.arguments,
+        \)
+
         let l:request_id = ale#lsp#Send(a:data.connection_id, l:message)
     elseif has_key(a:item, 'edit') || has_key(a:item, 'arguments')
         if has_key(a:item, 'edit')
@@ -299,7 +307,7 @@ function! ale#codefix#HandleLSPResponse(conn_id, response) abort
     endif
 endfunction
 
-function! s:FindError(buffer, line, column, end_line, end_column) abort
+function! s:FindError(buffer, line, column, end_line, end_column, linter_name) abort
     let l:nearest_error = v:null
 
     if a:line == a:end_line
@@ -308,7 +316,9 @@ function! s:FindError(buffer, line, column, end_line, end_column) abort
         let l:nearest_error_diff = -1
 
         for l:error in get(g:ale_buffer_info[a:buffer], 'loclist', [])
-            if has_key(l:error, 'code') && l:error.lnum == a:line
+            if has_key(l:error, 'code')
+            \  && (a:linter_name is v:null || l:error.linter_name is# a:linter_name)
+            \  && l:error.lnum == a:line
                 let l:diff = abs(l:error.col - a:column)
 
                 if l:nearest_error_diff == -1 || l:diff < l:nearest_error_diff
@@ -341,7 +351,7 @@ function! s:OnReady(
 
     if a:linter.lsp is# 'tsserver'
         let l:nearest_error =
-        \   s:FindError(l:buffer, a:line, a:column, a:end_line, a:end_column)
+        \   s:FindError(l:buffer, a:line, a:column, a:end_line, a:end_column, a:linter.lsp)
 
         if l:nearest_error isnot v:null
             let l:message = ale#lsp#tsserver_message#GetCodeFixes(
@@ -368,7 +378,7 @@ function! s:OnReady(
 
         let l:diagnostics = []
         let l:nearest_error =
-        \   s:FindError(l:buffer, a:line, a:column, a:end_line, a:end_column)
+        \   s:FindError(l:buffer, a:line, a:column, a:end_line, a:end_column, v:null)
 
         if l:nearest_error isnot v:null
             let l:diagnostics = [
diff --git a/sources_non_forked/ale/autoload/ale/completion.vim b/sources_non_forked/ale/autoload/ale/completion.vim
index 5237288e..e139feaa 100644
--- a/sources_non_forked/ale/autoload/ale/completion.vim
+++ b/sources_non_forked/ale/autoload/ale/completion.vim
@@ -1001,12 +1001,11 @@ endfunction
 
 function! ale#completion#HandleUserData(completed_item) abort
     let l:user_data_json = get(a:completed_item, 'user_data', '')
-    let l:user_data = !empty(l:user_data_json)
-    \   ? ale#util#FuzzyJSONDecode(l:user_data_json, v:null)
-    \   : v:null
+    let l:user_data = type(l:user_data_json) is v:t_dict
+    \   ? l:user_data_json
+    \   : ale#util#FuzzyJSONDecode(l:user_data_json, {})
 
-    if type(l:user_data) isnot v:t_dict
-    \|| get(l:user_data, '_ale_completion_item', 0) isnot 1
+    if !has_key(l:user_data, '_ale_completion_item')
         return
     endif
 
diff --git a/sources_non_forked/ale/autoload/ale/fix/registry.vim b/sources_non_forked/ale/autoload/ale/fix/registry.vim
index 7a4d964e..0447bd3e 100644
--- a/sources_non_forked/ale/autoload/ale/fix/registry.vim
+++ b/sources_non_forked/ale/autoload/ale/fix/registry.vim
@@ -246,6 +246,11 @@ let s:default_registry = {
 \       'suggested_filetypes': ['go'],
 \       'description': 'Fix Go files imports with goimports.',
 \   },
+\   'golines': {
+\       'function': 'ale#fixers#golines#Fix',
+\       'suggested_filetypes': ['go'],
+\        'description': 'Fix Go file long lines with golines',
+\   },
 \   'gomod': {
 \       'function': 'ale#fixers#gomod#Fix',
 \       'suggested_filetypes': ['gomod'],
@@ -301,6 +306,11 @@ let s:default_registry = {
 \       'suggested_filetypes': ['haskell'],
 \       'description': 'Refactor Haskell files with stylish-haskell.',
 \   },
+\   'purs-tidy': {
+\       'function': 'ale#fixers#purs_tidy#Fix',
+\       'suggested_filetypes': ['purescript'],
+\       'description': 'Format PureScript files with purs-tidy.',
+\   },
 \   'purty': {
 \       'function': 'ale#fixers#purty#Fix',
 \       'suggested_filetypes': ['purescript'],
@@ -386,6 +396,11 @@ let s:default_registry = {
 \       'suggested_filetypes': ['dart'],
 \       'description': 'Fix Dart files with dart format.',
 \   },
+\   'dotnet-format': {
+\       'function': 'ale#fixers#dotnet_format#Fix',
+\       'suggested_filetypes': ['cs'],
+\       'description': 'Fix C# files with dotnet format.',
+\   },
 \   'xmllint': {
 \       'function': 'ale#fixers#xmllint#Fix',
 \       'suggested_filetypes': ['xml'],
@@ -471,6 +486,11 @@ let s:default_registry = {
 \       'suggested_filetypes': ['haskell'],
 \       'description': 'A formatter for Haskell source code.',
 \   },
+\   'jsonnetfmt': {
+\       'function': 'ale#fixers#jsonnetfmt#Fix',
+\       'suggested_filetypes': ['jsonnet'],
+\       'description': 'Fix jsonnet files with jsonnetfmt',
+\   },
 \   'ptop': {
 \       'function': 'ale#fixers#ptop#Fix',
 \       'suggested_filetypes': ['pascal'],
diff --git a/sources_non_forked/ale/autoload/ale/fixers/dhall_format.vim b/sources_non_forked/ale/autoload/ale/fixers/dhall_format.vim
index d4021983..4f12abc8 100644
--- a/sources_non_forked/ale/autoload/ale/fixers/dhall_format.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/dhall_format.vim
@@ -1,14 +1,11 @@
-" Author: toastal <toastal@protonmail.com>
+" Author: toastal <toastal@posteo.net>
 " Description: Dhall’s built-in formatter
 "
 function! ale#fixers#dhall_format#Fix(buffer) abort
     let l:executable = ale#dhall#GetExecutableWithOptions(a:buffer)
-    let l:command = l:executable
-    \   . ' format'
-    \   . ' --inplace %t'
 
     return {
-    \   'command': l:command,
-    \   'read_temporary_file': 1,
+    \   'command': l:executable
+    \       . ' format'
     \}
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/dhall_freeze.vim b/sources_non_forked/ale/autoload/ale/fixers/dhall_freeze.vim
index 74ae7530..ff54482d 100644
--- a/sources_non_forked/ale/autoload/ale/fixers/dhall_freeze.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/dhall_freeze.vim
@@ -1,18 +1,14 @@
-" Author: toastal <toastal@protonmail.com>
+" Author: toastal <toastal@posteo.net>
 " Description: Dhall’s package freezing
 
 call ale#Set('dhall_freeze_options', '')
 
 function! ale#fixers#dhall_freeze#Freeze(buffer) abort
     let l:executable = ale#dhall#GetExecutableWithOptions(a:buffer)
-    let l:command = l:executable
-    \   . ' freeze'
-    \   . ale#Pad(ale#Var(a:buffer, 'dhall_freeze_options'))
-    \   . ' --inplace %t'
-
 
     return {
-    \   'command': l:command,
-    \   'read_temporary_file': 1,
+    \   'command': l:executable
+    \       . ' freeze'
+    \       . ale#Pad(ale#Var(a:buffer, 'dhall_freeze_options'))
     \}
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/dhall_lint.vim b/sources_non_forked/ale/autoload/ale/fixers/dhall_lint.vim
index 2abbe6f7..149a6581 100644
--- a/sources_non_forked/ale/autoload/ale/fixers/dhall_lint.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/dhall_lint.vim
@@ -1,14 +1,11 @@
-" Author: toastal <toastal@protonmail.com>
+" Author: toastal <toastal@posteo.net>
 " Description: Dhall’s built-in linter/formatter
 
 function! ale#fixers#dhall_lint#Fix(buffer) abort
     let l:executable = ale#dhall#GetExecutableWithOptions(a:buffer)
-    let l:command = l:executable
-    \   . ' lint'
-    \   . ' --inplace %t'
 
     return {
-    \   'command': l:command,
-    \   'read_temporary_file': 1,
+    \   'command': l:executable
+    \       . ' lint'
     \}
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/dotnet_format.vim b/sources_non_forked/ale/autoload/ale/fixers/dotnet_format.vim
new file mode 100644
index 00000000..b44a28bd
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/dotnet_format.vim
@@ -0,0 +1,18 @@
+" Author: ghsang <gwonhyuksang@gmail.com>
+" Description: Integration of dotnet format with ALE.
+
+call ale#Set('cs_dotnet_format_executable', 'dotnet')
+call ale#Set('cs_dotnet_format_options', '')
+
+function! ale#fixers#dotnet_format#Fix(buffer) abort
+    let l:executable = ale#Var(a:buffer, 'cs_dotnet_format_executable')
+    let l:options = ale#Var(a:buffer, 'cs_dotnet_format_options')
+
+    return {
+    \   'command': ale#Escape(l:executable)
+    \       . ' format'
+    \       . (empty(l:options) ? '' : ' ' . l:options)
+    \       . ' --folder --include %t "$(dirname %t)"',
+    \   'read_temporary_file': 1,
+    \}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/golines.vim b/sources_non_forked/ale/autoload/ale/fixers/golines.vim
new file mode 100644
index 00000000..9326f482
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/golines.vim
@@ -0,0 +1,21 @@
+" Author Pig Frown <pigfrown@protonmail.com>
+" Description: Fix Go files long lines with golines"
+
+call ale#Set('go_golines_executable', 'golines')
+
+call ale#Set('go_golines_options', '')
+
+function! ale#fixers#golines#Fix(buffer) abort
+    let l:executable = ale#Var(a:buffer, 'go_golines_executable')
+    let l:options = ale#Var(a:buffer, 'go_golines_options')
+    let l:env = ale#go#EnvString(a:buffer)
+
+    if !executable(l:executable)
+        return 0
+    endif
+
+    return {
+    \   'command': l:env . ale#Escape(l:executable)
+    \       . (empty(l:options) ? '' : ' ' . l:options)
+    \}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/isort.vim b/sources_non_forked/ale/autoload/ale/fixers/isort.vim
index a640d233..082e77ec 100644
--- a/sources_non_forked/ale/autoload/ale/fixers/isort.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/isort.vim
@@ -5,6 +5,7 @@ call ale#Set('python_isort_executable', 'isort')
 call ale#Set('python_isort_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('python_isort_options', '')
 call ale#Set('python_isort_auto_pipenv', 0)
+call ale#Set('python_isort_auto_poetry', 0)
 
 function! ale#fixers#isort#GetExecutable(buffer) abort
     if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_isort_auto_pipenv'))
@@ -12,24 +13,34 @@ function! ale#fixers#isort#GetExecutable(buffer) abort
         return 'pipenv'
     endif
 
+    if (ale#Var(a:buffer, 'python_auto_poetry') || ale#Var(a:buffer, 'python_isort_auto_poetry'))
+    \ && ale#python#PoetryPresent(a:buffer)
+        return 'poetry'
+    endif
+
     return ale#python#FindExecutable(a:buffer, 'python_isort', ['isort'])
 endfunction
 
 function! ale#fixers#isort#Fix(buffer) abort
-    let l:options = ale#Var(a:buffer, 'python_isort_options')
     let l:executable = ale#fixers#isort#GetExecutable(a:buffer)
-    let l:exec_args = l:executable =~? 'pipenv$'
-    \   ? ' run isort'
-    \   : ''
+    let l:cmd = [ale#Escape(l:executable)]
 
-    if !executable(l:executable) && l:executable isnot# 'pipenv'
-        return 0
+    if l:executable =~? 'pipenv\|poetry$'
+        call extend(l:cmd, ['run', 'isort'])
     endif
 
+    call add(l:cmd, '--filename %s')
+
+    let l:options = ale#Var(a:buffer, 'python_isort_options')
+
+    if !empty(l:options)
+        call add(l:cmd, l:options)
+    endif
+
+    call add(l:cmd, '-')
+
     return {
     \   'cwd': '%s:h',
-    \   'command': ale#Escape(l:executable) . l:exec_args
-    \   . ale#Pad('--filename %s')
-    \   . (!empty(l:options) ? ' ' . l:options : '') . ' -',
+    \   'command': join(l:cmd, ' ')
     \}
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/jsonnetfmt.vim b/sources_non_forked/ale/autoload/ale/fixers/jsonnetfmt.vim
new file mode 100644
index 00000000..f1e41cd5
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/jsonnetfmt.vim
@@ -0,0 +1,18 @@
+" Authors: Trevor Whitney <trevorjwhitney@gmail.com> and Takuya Kosugiyama <re@itkq.jp>
+" Description: Integration of jsonnetfmt with ALE.
+
+call ale#Set('jsonnet_jsonnetfmt_executable', 'jsonnetfmt')
+call ale#Set('jsonnet_jsonnetfmt_options', '')
+
+function! ale#fixers#jsonnetfmt#Fix(buffer) abort
+    let l:executable = ale#Var(a:buffer, 'jsonnet_jsonnetfmt_executable')
+    let l:options = ale#Var(a:buffer, 'jsonnet_jsonnetfmt_options')
+
+    return {
+    \   'command': ale#Escape(l:executable)
+    \       . ' -i'
+    \       . ale#Pad(l:options)
+    \       . ' %t',
+    \   'read_temporary_file': 1,
+    \}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/purs_tidy.vim b/sources_non_forked/ale/autoload/ale/fixers/purs_tidy.vim
new file mode 100644
index 00000000..09fa631b
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/purs_tidy.vim
@@ -0,0 +1,24 @@
+" Author: toastal <toastal@posteo.net>
+" Description: Integration of purs-tidy with ALE.
+
+call ale#Set('purescript_tidy_executable', 'purs-tidy')
+call ale#Set('purescript_tidy_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('purescript_tidy_options', '')
+
+function! ale#fixers#purs_tidy#GetExecutable(buffer) abort
+    return ale#path#FindExecutable(a:buffer, 'purescript_tidy', [
+    \   'node_modules/purescript-tidy/bin/index.js',
+    \   'node_modules/.bin/purs-tidy',
+    \])
+endfunction
+
+function! ale#fixers#purs_tidy#Fix(buffer) abort
+    let l:executable = ale#fixers#purs_tidy#GetExecutable(a:buffer)
+    let l:options = ale#Var(a:buffer, 'purescript_tidy_options')
+
+    return {
+    \   'command': ale#Escape(l:executable)
+    \       . ' format'
+    \       . ale#Pad(l:options)
+    \}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/rubocop.vim b/sources_non_forked/ale/autoload/ale/fixers/rubocop.vim
index cdfb014a..5a1b7959 100644
--- a/sources_non_forked/ale/autoload/ale/fixers/rubocop.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/rubocop.vim
@@ -21,12 +21,10 @@ endfunction
 
 function! ale#fixers#rubocop#GetCommand(buffer) abort
     let l:executable = ale#Var(a:buffer, 'ruby_rubocop_executable')
-    let l:config = ale#path#FindNearestFile(a:buffer, '.rubocop.yml')
     let l:options = ale#Var(a:buffer, 'ruby_rubocop_options')
     let l:auto_correct_all = ale#Var(a:buffer, 'ruby_rubocop_auto_correct_all')
 
     return ale#ruby#EscapeExecutable(l:executable, 'rubocop')
-    \   . (!empty(l:config) ? ' --config ' . ale#Escape(l:config) : '')
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . (l:auto_correct_all ? ' --auto-correct-all' : ' --auto-correct')
     \   . ' --force-exclusion --stdin %s'
diff --git a/sources_non_forked/ale/autoload/ale/handlers/cppcheck.vim b/sources_non_forked/ale/autoload/ale/handlers/cppcheck.vim
index b70ae1bf..a07d0aed 100644
--- a/sources_non_forked/ale/autoload/ale/handlers/cppcheck.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/cppcheck.vim
@@ -43,21 +43,25 @@ endfunction
 function! ale#handlers#cppcheck#HandleCppCheckFormat(buffer, lines) abort
     " Look for lines like the following.
     "
-    "test.cpp:974:6: error: Array 'n[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\
+    "test.cpp:974:6: error:inconclusive Array 'n[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\
     "    n[3]=3;
     "     ^
-    let l:pattern = '\v^(\f+):(\d+):(\d+): (\w+): (.*) \[(\w+)\]\'
+    "" OR if cppcheck doesn't support {column} or {inconclusive:text}:
+    "test.cpp:974:{column}: error:{inconclusive:inconclusive} Array 'n[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\
+    "    n[3]=3;
+    "     ^
+    let l:pattern = '\v(\f+):(\d+):(\d+|\{column\}): (\w+):(\{inconclusive:inconclusive\})? ?(.*) \[(\w+)\]\'
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
         if ale#path#IsBufferPath(a:buffer, l:match[1])
             call add(l:output, {
             \   'lnum':     str2nr(l:match[2]),
-            \   'col':      str2nr(l:match[3]),
+            \   'col':      match(l:match[3],'{column}') >= 0 ? 1 : str2nr(l:match[3]),
             \   'type':     l:match[4] is# 'error' ? 'E' : 'W',
             \   'sub_type': l:match[4] is# 'style' ? 'style' : '',
-            \   'text':     l:match[5],
-            \   'code':     l:match[6]
+            \   'text':     l:match[6],
+            \   'code':     l:match[7]
             \})
         endif
     endfor
diff --git a/sources_non_forked/ale/autoload/ale/handlers/sml.vim b/sources_non_forked/ale/autoload/ale/handlers/sml.vim
index 594ee4f7..f5365dd6 100644
--- a/sources_non_forked/ale/autoload/ale/handlers/sml.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/sml.vim
@@ -56,19 +56,19 @@ function! ale#handlers#sml#Handle(buffer, lines) abort
     " Try to match basic sml errors
     " TODO(jez) We can get better errorfmt strings from Syntastic
     let l:out = []
-    let l:pattern = '^.*\:\([0-9\.]\+\)\ \(\w\+\)\:\ \(.*\)'
-    let l:pattern2 = '^.*\:\([0-9]\+\)\.\?\([0-9]\+\).* \(\(Warning\|Error\): .*\)'
+    let l:pattern = '^\(.*\)\:\([0-9\.]\+\)\ \(\w\+\)\:\ \(.*\)'
+    let l:pattern2 = '^\(.*\)\:\([0-9]\+\)\.\?\([0-9]\+\).* \(\(Warning\|Error\): .*\)'
 
     for l:line in a:lines
         let l:match2 = matchlist(l:line, l:pattern2)
 
         if len(l:match2) != 0
             call add(l:out, {
-            \   'bufnr': a:buffer,
-            \   'lnum': l:match2[1] + 0,
-            \   'col' : l:match2[2] - 1,
-            \   'text': l:match2[3],
-            \   'type': l:match2[3] =~# '^Warning' ? 'W' : 'E',
+            \   'filename': l:match2[1],
+            \   'lnum': l:match2[2] + 0,
+            \   'col' : l:match2[3] - 1,
+            \   'text': l:match2[4],
+            \   'type': l:match2[4] =~# '^Warning' ? 'W' : 'E',
             \})
 
             continue
@@ -78,10 +78,10 @@ function! ale#handlers#sml#Handle(buffer, lines) abort
 
         if len(l:match) != 0
             call add(l:out, {
-            \   'bufnr': a:buffer,
-            \   'lnum': l:match[1] + 0,
-            \   'text': l:match[2] . ': ' . l:match[3],
-            \   'type': l:match[2] is# 'error' ? 'E' : 'W',
+            \   'filename': l:match[1],
+            \   'lnum': l:match[2] + 0,
+            \   'text': l:match[3] . ': ' . l:match[4],
+            \   'type': l:match[3] is# 'error' ? 'E' : 'W',
             \})
             continue
         endif
diff --git a/sources_non_forked/ale/autoload/ale/hover.vim b/sources_non_forked/ale/autoload/ale/hover.vim
index cb0379fd..4513c6ad 100644
--- a/sources_non_forked/ale/autoload/ale/hover.vim
+++ b/sources_non_forked/ale/autoload/ale/hover.vim
@@ -45,7 +45,9 @@ function! ale#hover#HandleTSServerResponse(conn_id, response) abort
             \&& (l:set_balloons is 1 || l:set_balloons is# 'hover')
                 call balloon_show(a:response.body.displayString)
             elseif get(l:options, 'truncated_echo', 0)
-                call ale#cursor#TruncatedEcho(split(a:response.body.displayString, "\n")[0])
+                if !empty(a:response.body.displayString)
+                    call ale#cursor#TruncatedEcho(split(a:response.body.displayString, "\n")[0])
+                endif
             elseif g:ale_hover_to_floating_preview || g:ale_floating_preview
                 call ale#floating_preview#Show(split(a:response.body.displayString, "\n"), {
                 \   'filetype': 'ale-preview.message',
diff --git a/sources_non_forked/ale/autoload/ale/lsp.vim b/sources_non_forked/ale/autoload/ale/lsp.vim
index 1f854bc5..510f3e95 100644
--- a/sources_non_forked/ale/autoload/ale/lsp.vim
+++ b/sources_non_forked/ale/autoload/ale/lsp.vim
@@ -45,6 +45,7 @@ function! ale#lsp#Register(executable_or_address, project, init_options) abort
         \       'typeDefinition': 0,
         \       'symbol_search': 0,
         \       'code_actions': 0,
+        \       'includeText': 0,
         \   },
         \}
     endif
@@ -263,6 +264,20 @@ function! s:UpdateCapabilities(conn, capabilities) abort
     if type(get(a:capabilities, 'workspaceSymbolProvider')) is v:t_dict
         let a:conn.capabilities.symbol_search = 1
     endif
+
+    if has_key(a:capabilities, 'textDocumentSync')
+        if type(a:capabilities.textDocumentSync) is v:t_dict
+            let l:save = get(a:capabilities.textDocumentSync, 'save', v:false)
+
+            if type(l:save) is v:true
+                let a:conn.capabilities.includeText = 1
+            endif
+
+            if type(l:save) is v:t_dict && get(a:capabilities.textDocumentSync.save, 'includeText', v:false) is v:true
+                let a:conn.capabilities.includeText = 1
+            endif
+        endif
+    endif
 endfunction
 
 " Update a connection's configuration dictionary and notify LSP servers
diff --git a/sources_non_forked/ale/autoload/ale/lsp/message.vim b/sources_non_forked/ale/autoload/ale/lsp/message.vim
index 38be4da6..b40c4407 100644
--- a/sources_non_forked/ale/autoload/ale/lsp/message.vim
+++ b/sources_non_forked/ale/autoload/ale/lsp/message.vim
@@ -77,12 +77,19 @@ function! ale#lsp#message#DidChange(buffer) abort
     \}]
 endfunction
 
-function! ale#lsp#message#DidSave(buffer) abort
-    return [1, 'textDocument/didSave', {
+function! ale#lsp#message#DidSave(buffer, includeText) abort
+    let l:response = [1, 'textDocument/didSave', {
     \   'textDocument': {
     \       'uri': ale#path#ToURI(expand('#' . a:buffer . ':p')),
     \   },
     \}]
+
+    if a:includeText
+        let l:response[2].textDocument.version = ale#lsp#message#GetNextVersionID()
+        let l:response[2].text = ale#util#GetBufferContents(a:buffer)
+    endif
+
+    return l:response
 endfunction
 
 function! ale#lsp#message#DidClose(buffer) abort
diff --git a/sources_non_forked/ale/autoload/ale/lsp_linter.vim b/sources_non_forked/ale/autoload/ale/lsp_linter.vim
index b8885f31..753fb57b 100644
--- a/sources_non_forked/ale/autoload/ale/lsp_linter.vim
+++ b/sources_non_forked/ale/autoload/ale/lsp_linter.vim
@@ -271,6 +271,30 @@ function! ale#lsp_linter#OnInit(linter, details, Callback) abort
         call ale#lsp#NotifyForChanges(l:conn_id, l:buffer)
     endif
 
+    " Tell the relevant buffer that the LSP has started via an autocmd.
+    if l:buffer > 0
+        if l:buffer == bufnr('')
+            silent doautocmd <nomodeline> User ALELSPStarted
+        else
+            execute 'augroup ALELSPStartedGroup' . l:buffer
+                autocmd!
+
+                execute printf(
+                \   'autocmd BufEnter <buffer=%d>'
+                \       . ' doautocmd <nomodeline> User ALELSPStarted',
+                \   l:buffer
+                \)
+
+                " Replicate ++once behavior for backwards compatibility.
+                execute printf(
+                \   'autocmd BufEnter <buffer=%d>'
+                \       . ' autocmd! ALELSPStartedGroup%d',
+                \   l:buffer, l:buffer
+                \)
+            augroup END
+        endif
+    endif
+
     call a:Callback(a:linter, a:details)
 endfunction
 
@@ -442,7 +466,8 @@ function! s:CheckWithLSP(linter, details) abort
     " If this was a file save event, also notify the server of that.
     if a:linter.lsp isnot# 'tsserver'
     \&& getbufvar(l:buffer, 'ale_save_event_fired', 0)
-        let l:save_message = ale#lsp#message#DidSave(l:buffer)
+        let l:include_text = ale#lsp#HasCapability(l:buffer, 'includeText')
+        let l:save_message = ale#lsp#message#DidSave(l:buffer, l:include_text)
         let l:notified = ale#lsp#Send(l:id, l:save_message) != 0
     endif
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/python.vim b/sources_non_forked/ale/autoload/ale/python.vim
index ee856a27..81cb06e0 100644
--- a/sources_non_forked/ale/autoload/ale/python.vim
+++ b/sources_non_forked/ale/autoload/ale/python.vim
@@ -24,6 +24,7 @@ function! ale#python#FindProjectRootIni(buffer) abort
         \|| filereadable(l:path . '/setup.cfg')
         \|| filereadable(l:path . '/pytest.ini')
         \|| filereadable(l:path . '/tox.ini')
+        \|| filereadable(l:path . '/.pyre_configuration.local')
         \|| filereadable(l:path . '/mypy.ini')
         \|| filereadable(l:path . '/pycodestyle.cfg')
         \|| filereadable(l:path . '/.flake8')
diff --git a/sources_non_forked/ale/autoload/ale/util.vim b/sources_non_forked/ale/autoload/ale/util.vim
index 5b2bfcd7..ec9383ac 100644
--- a/sources_non_forked/ale/autoload/ale/util.vim
+++ b/sources_non_forked/ale/autoload/ale/util.vim
@@ -535,3 +535,7 @@ function! ale#util#SetBufferContents(buffer, lines) abort
 
     return l:new_lines
 endfunction
+
+function! ale#util#GetBufferContents(buffer) abort
+    return join(getbufline(a:buffer, 1, '$'), '\n') . '\n'
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/virtualtext.vim b/sources_non_forked/ale/autoload/ale/virtualtext.vim
index d7c5360e..2a9903bc 100644
--- a/sources_non_forked/ale/autoload/ale/virtualtext.vim
+++ b/sources_non_forked/ale/autoload/ale/virtualtext.vim
@@ -7,9 +7,15 @@ scriptencoding utf-8
 let g:ale_virtualtext_delay = get(g:, 'ale_virtualtext_delay', 10)
 let s:cursor_timer = -1
 let s:last_pos = [0, 0, 0]
+let s:has_virt_text = 0
 
 if has('nvim-0.3.2')
     let s:ns_id = nvim_create_namespace('ale')
+    let s:has_virt_text = 1
+elseif has('textprop') && has('popupwin')
+    call prop_type_add('ale', {})
+    let s:last_popup = -1
+    let s:has_virt_text = 1
 endif
 
 if !hlexists('ALEVirtualTextError')
@@ -33,17 +39,25 @@ if !hlexists('ALEVirtualTextInfo')
 endif
 
 function! ale#virtualtext#Clear() abort
-    if !has('nvim-0.3.2')
+    if !s:has_virt_text
         return
     endif
 
     let l:buffer = bufnr('')
 
-    call nvim_buf_clear_highlight(l:buffer, s:ns_id, 0, -1)
+    if has('nvim')
+        call nvim_buf_clear_highlight(l:buffer, s:ns_id, 0, -1)
+    else
+        if s:last_popup != -1
+            call prop_remove({'type': 'ale'})
+            call popup_close(s:last_popup)
+            let s:last_popup = -1
+        endif
+    endif
 endfunction
 
 function! ale#virtualtext#ShowMessage(message, hl_group) abort
-    if !has('nvim-0.3.2')
+    if !s:has_virt_text
         return
     endif
 
@@ -51,7 +65,24 @@ function! ale#virtualtext#ShowMessage(message, hl_group) abort
     let l:buffer = bufnr('')
     let l:prefix = get(g:, 'ale_virtualtext_prefix', '> ')
 
-    call nvim_buf_set_virtual_text(l:buffer, s:ns_id, l:line-1, [[l:prefix.a:message, a:hl_group]], {})
+    if has('nvim')
+        call nvim_buf_set_virtual_text(l:buffer, s:ns_id, l:line-1, [[l:prefix.a:message, a:hl_group]], {})
+    else
+        let l:left_pad = col('$')
+        call prop_add(l:line, l:left_pad, {
+        \ 'type': 'ale',
+        \})
+        let s:last_popup = popup_create(l:prefix.a:message, {
+        \ 'line': -1,
+        \ 'padding': [0, 0, 0, 1],
+        \ 'mask': [[1, 1, 1, 1]],
+        \ 'textprop': 'ale',
+        \ 'highlight': a:hl_group,
+        \ 'fixed': 1,
+        \ 'wrap': 0,
+        \ 'zindex': 2
+        \})
+    endif
 endfunction
 
 function! s:StopCursorTimer() abort
diff --git a/sources_non_forked/ale/doc/ale-cs.txt b/sources_non_forked/ale/doc/ale-cs.txt
index bb13863f..bef495b9 100644
--- a/sources_non_forked/ale/doc/ale-cs.txt
+++ b/sources_non_forked/ale/doc/ale-cs.txt
@@ -90,6 +90,39 @@ g:ale_cs_csc_assemblies                               *g:ale_cs_csc_assemblies*
     \]
 <
 
+===============================================================================
+dotnet-format                                            *ale-cs-dotnet-format*
+
+Installation
+-------------------------------------------------------------------------------
+
+Installing .NET SDK should probably ensure that `dotnet` is in your `$PATH`.
+For .NET 6 the `dotnet format` tool is already included in the .NET SDK. For
+.NET 5 or below you will have to manually install it using the instructions
+from listed in this repository: https://github.com/dotnet/format
+
+
+Options
+-------------------------------------------------------------------------------
+
+g:ale_cs_dotnet_format_executable           *g:ale_cs_dotnet_format_executable*
+                                            *b:ale_cs_dotnet_format_executable*
+  Type: |String|
+  Default: `'dotnet'`
+
+  This variable can be set to specify an absolute path to the
+  `dotnet` executable (or to specify an alternate executable).
+
+
+g:ale_cs_dotnet_format_options                 *g:ale_cs_dotnet_format_options*
+                                               *b:ale_cs_dotnet_format_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be set to pass additional options to the `dotnet format`
+  fixer.
+
+
 ===============================================================================
 mcs                                                                *ale-cs-mcs*
 
diff --git a/sources_non_forked/ale/doc/ale-development.txt b/sources_non_forked/ale/doc/ale-development.txt
index 7f8ec28f..3d0dd524 100644
--- a/sources_non_forked/ale/doc/ale-development.txt
+++ b/sources_non_forked/ale/doc/ale-development.txt
@@ -156,7 +156,8 @@ environments.
 2. Vim 8.2.2401 on Linux via GitHub Actions.
 3. NeoVim 0.2.0 on Linux via GitHub Actions.
 4. NeoVim 0.4.4 on Linux via GitHub Actions.
-5. Vim 8 (stable builds) on Windows via AppVeyor.
+5. NeoVim 0.5.0 on Linux via GitHub Actions.
+6. Vim 8 (stable builds) on Windows via AppVeyor.
 
 If you are developing ALE code on Linux, Mac OSX, or BSD, you can run ALEs
 tests by installing Docker and running the `run-tests` script. Follow the
diff --git a/sources_non_forked/ale/doc/ale-dhall.txt b/sources_non_forked/ale/doc/ale-dhall.txt
index 44b0bf32..9b997b9e 100644
--- a/sources_non_forked/ale/doc/ale-dhall.txt
+++ b/sources_non_forked/ale/doc/ale-dhall.txt
@@ -6,15 +6,15 @@ g:ale_dhall_executable                                 *g:ale_dhall_executable*
   Type: |String|
   Default: `'dhall'`
 
-g:ale_dhall_options                                       g:ale_dhall_options
-                                                          b:ale_dhall_options
+g:ale_dhall_options                                       *g:ale_dhall_options*
+                                                          *b:ale_dhall_options*
   Type: |String|
   Default: `''`
 
   This variable can be set to pass additional options to the 'dhall` executable.
   This is shared with `dhall-freeze` and `dhall-lint`.
 >
-  let g:dhall_options = '--ascii'
+  let g:ale_dhall_options = '--ascii'
 <
 
 ===============================================================================
@@ -30,15 +30,15 @@ dhall-freeze                                                 *ale-dhall-freeze*
 Dhall
   (https://dhall-lang.org/)
 
-g:ale_dhall_freeze_options                         g:ale_dhall_freeze_options
-                                                   b:ale_dhall_freeze_options
+g:ale_dhall_freeze_options                         *g:ale_dhall_freeze_options*
+                                                   *b:ale_dhall_freeze_options*
   Type: |String|
   Default: `''`
 
   This variable can be set to pass additional options to the 'dhall freeze`
   executable.
 >
-  let g:dhall_freeze_options = '--all'
+  let g:ale_dhall_freeze_options = '--all'
 <
 
 ===============================================================================
diff --git a/sources_non_forked/ale/doc/ale-eruby.txt b/sources_non_forked/ale/doc/ale-eruby.txt
index d75d3868..48a34895 100644
--- a/sources_non_forked/ale/doc/ale-eruby.txt
+++ b/sources_non_forked/ale/doc/ale-eruby.txt
@@ -4,6 +4,7 @@ ALE Eruby Integration                                       *ale-eruby-options*
 There are four linters for `eruby` files:
 
 - `erb`
+- `erblint`
 - `erubis`
 - `erubi`
 - `ruumba`
@@ -13,6 +14,26 @@ default parser in Rails between 3.0 and 5.1. `erubi` is the default in Rails
 5.1 and later. `ruumba` can extract Ruby from eruby files and run rubocop on
 the result. To selectively enable a subset, see |g:ale_linters|.
 
+===============================================================================
+erblint                                                     *ale-eruby-erblint*
+
+g:ale_eruby_erblint_executable                 *g:ale_eruby_erblint_executable*
+                                               *b:ale_eruby_erblint_executable*
+  Type: |String|
+  Default: `'erblint'`
+
+  Override the invoked erblint binary. This is useful for running erblint
+  from binstubs or a bundle.
+
+
+g:ale_eruby_erblint_options                        *g:ale_ruby_erblint_options*
+                                                   *b:ale_ruby_erblint_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be change to modify flags given to erblint.
+
+
 ===============================================================================
 ruumba                                                       *ale-eruby-ruumba*
 
diff --git a/sources_non_forked/ale/doc/ale-go.txt b/sources_non_forked/ale/doc/ale-go.txt
index 7813c7b3..2f1e4c1c 100644
--- a/sources_non_forked/ale/doc/ale-go.txt
+++ b/sources_non_forked/ale/doc/ale-go.txt
@@ -133,6 +133,23 @@ g:ale_go_langserver_options                       *g:ale_go_langserver_options*
   `-gocodecompletion` option is ignored because it is handled automatically
   by the |g:ale_completion_enabled| variable.
 
+===============================================================================
+golines                                                        *ale-go-golines*
+
+g:ale_go_golines_executable                         *g:ale_go_lines_executable*
+                                                    *b:ale_go_lines_executable*
+  Type: |String|
+  Default: `'golines'`
+
+  Location of the golines binary file
+
+g:ale_go_golines_options                             *g:ale_go_golines_options*
+                                                     *b:ale_go_golines_options*
+  Type: |String|
+  Default: ''
+
+  Additional options passed to the golines command. By default golines has 
+  --max-length=100 (lines above 100 characters will be wrapped)
 
 ===============================================================================
 golint                                                          *ale-go-golint*
diff --git a/sources_non_forked/ale/doc/ale-javascript.txt b/sources_non_forked/ale/doc/ale-javascript.txt
index 13059eaa..acd886c9 100644
--- a/sources_non_forked/ale/doc/ale-javascript.txt
+++ b/sources_non_forked/ale/doc/ale-javascript.txt
@@ -23,6 +23,11 @@ To this: >
   /path/foo/bar/.eslintrc.js # extends: ["/path/foo/.base-eslintrc.js"]
 <
 
+===============================================================================
+deno                                                      *ale-javascript-deno*
+
+Check the docs over at |ale-typescript-deno|.
+
 ===============================================================================
 eslint                                                  *ale-javascript-eslint*
 
diff --git a/sources_non_forked/ale/doc/ale-json.txt b/sources_non_forked/ale/doc/ale-json.txt
index dc91e14c..ad0a05b1 100644
--- a/sources_non_forked/ale/doc/ale-json.txt
+++ b/sources_non_forked/ale/doc/ale-json.txt
@@ -2,6 +2,15 @@
 ALE JSON Integration                                         *ale-json-options*
 
 
+===============================================================================
+eslint                                                        *ale-json-eslint*
+
+The `eslint` linter for JSON uses the JavaScript options for `eslint`; see:
+|ale-javascript-eslint|.
+
+You will need a JSON ESLint plugin installed for this to work.
+
+
 ===============================================================================
 fixjson                                                      *ale-json-fixjson*
 
diff --git a/sources_non_forked/ale/doc/ale-json5.txt b/sources_non_forked/ale/doc/ale-json5.txt
new file mode 100644
index 00000000..bafa60d1
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-json5.txt
@@ -0,0 +1,15 @@
+===============================================================================
+ALE JSON5 Integration                                       *ale-json5-options*
+
+
+===============================================================================
+eslint                                                       *ale-json5-eslint*
+
+The `eslint` linter for JSON uses the JavaScript options for `eslint`; see:
+|ale-javascript-eslint|.
+
+You will need a JSON5 ESLint plugin installed for this to work.
+
+
+===============================================================================
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-jsonc.txt b/sources_non_forked/ale/doc/ale-jsonc.txt
new file mode 100644
index 00000000..92247cd4
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-jsonc.txt
@@ -0,0 +1,15 @@
+===============================================================================
+ALE JSONC Integration                                       *ale-jsonc-options*
+
+
+===============================================================================
+eslint                                                       *ale-jsonc-eslint*
+
+The `eslint` linter for JSON uses the JavaScript options for `eslint`; see:
+|ale-javascript-eslint|.
+
+You will need a JSONC ESLint plugin installed for this to work.
+
+
+===============================================================================
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-jsonnet.txt b/sources_non_forked/ale/doc/ale-jsonnet.txt
new file mode 100644
index 00000000..f99d415f
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-jsonnet.txt
@@ -0,0 +1,43 @@
+===============================================================================
+ALE Jsonnet Integration                                   *ale-jsonnet-options*
+
+
+===============================================================================
+jsonnetfmt                                             *ale-jsonnet-jsonnetfmt*
+
+g:ale_jsonnet_jsonnetfmt_executable       *g:ale_jsonnet_jsonnetfmt_executable*
+                                          *b:ale_jsonnet_jsonnetfmt_executable*
+  Type: |String|
+  Default: `'jsonnetfmt'`
+
+  This option can be changed to change the path for `jsonnetfmt`.
+
+
+g:ale_jsonnet_jsonnetfmt_options             *g:ale_jsonnet_jsonnetfmt_options*
+                                             *b:ale_jsonnet_jsonnetfmt_options*
+  Type: |String|
+  Default: `''`
+
+  This option can be changed to pass extra options to `jsonnetfmt`.
+
+
+===============================================================================
+jsonnet-lint                                         *ale-jsonnet-jsonnet-lint*
+
+g:ale_jsonnet_jsonnet_lint_executable   *g:ale_jsonnet_jsonnet_lint_executable*
+                                        *b:ale_jsonnet_jsonnet_lint_executable*
+  Type: |String|
+  Default: `'jsonnet-lint'`
+
+  This option can be changed to change the path for `jsonnet-lint`.
+
+
+g:ale_jsonnet_jsonnet_lint_options          *g:ale_jsonnet_jsonnet_lint_options*
+                                            *b:ale_jsonnet_jsonnet_lint_options*
+  Type: |String|
+  Default: `''`
+
+  This option can be changed to pass extra options to `jsonnet-lint`.
+
+
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-purescript.txt b/sources_non_forked/ale/doc/ale-purescript.txt
index 454bb7e4..91bef558 100644
--- a/sources_non_forked/ale/doc/ale-purescript.txt
+++ b/sources_non_forked/ale/doc/ale-purescript.txt
@@ -30,6 +30,33 @@ g:ale_purescript_ls_config                         g:ale_purescript_ls_config
 		\  }
 		\}
 ===============================================================================
+purs-tidy                                                 *ale-purescript-tidy*
+
+g:ale_purescript_tidy_executable             *g:ale_purescript_tidy_executable*
+                                             *b:ale_purescript_tidy_executable*
+  Type: |String|
+  Default: `'purs-tidy'`
+
+  This variable can be changed to use a different executable for purs-tidy.
+
+g:ale_purescript_tidy_use_global             *g:ale_purescript_tidy_use_global*
+                                             *b:ale_purescript_tidy_use_global*
+  Type: |Number|
+  Default: `get(g:, 'ale_use_global_executables', 0)`
+
+  See |ale-integrations-local-executables|
+
+g:ale_purescript_tidy_options                   *g:ale_purescript_tidy_options*
+                                                *b:ale_purescript_tidy_options*
+  Type: String
+  Default: `''`
+
+  This variable can be set to pass in additional option to the 'purs-tidy'
+  executable.
+>
+  let g:ale_purescript_options = '--indent 3'
+<
+===============================================================================
 purty                                                    *ale-purescript-purty*
 
 g:ale_purescript_purty_executable           *g:ale_purescript_purty_executable*
diff --git a/sources_non_forked/ale/doc/ale-python.txt b/sources_non_forked/ale/doc/ale-python.txt
index 7f746147..10cc2897 100644
--- a/sources_non_forked/ale/doc/ale-python.txt
+++ b/sources_non_forked/ale/doc/ale-python.txt
@@ -35,6 +35,7 @@ ALE will look for configuration files with the following filenames. >
   setup.cfg
   pytest.ini
   tox.ini
+  .pyre_configuration.local
   mypy.ini
   pycodestyle.cfg
   .flake8
@@ -319,6 +320,69 @@ g:ale_python_flake8_auto_poetry               *g:ale_python_flake8_auto_poetry*
   Detect whether the file is inside a poetry, and set the executable to `poetry`
   if true. This is overridden by a manually-set executable.
 
+===============================================================================
+flakehell                                                *ale-python-flakehell*
+
+g:ale_python_flakehell_change_directory*g:ale_python_flakehell_change_directory*
+                                       *b:ale_python_flakehell_change_directory*
+  Type: |String|
+  Default: `project`
+
+  If set to `project`, ALE will switch to the project root before checking file.
+  If set to `file`, ALE will switch to directory the Python file being
+  checked with `flakehell` is in before checking it.
+  You can turn it off with `off` option if you want to control the directory
+  Python is executed from yourself.
+
+
+g:ale_python_flakehell_executable            *g:ale_python_flakehell_executable*
+                                             *b:ale_python_flakehell_executable*
+  Type: |String|
+  Default: `'flakehell'`
+
+  This variable can be changed to modify the executable used for flakehell. Set
+  this to `'pipenv'` to invoke `'pipenv` `run` `flakehell'`. Set this to
+  `'poetry'` to invoke `'poetry` `run` `flakehell'`. Set this to `'python'` to
+  invoke `'python` `-m` `flakehell'`.
+
+
+g:ale_python_flakehell_options                  *g:ale_python_flakehell_options*
+                                                *b:ale_python_flakehell_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be changed to add command-line arguments to the flakehell
+  lint invocation.
+
+
+g:ale_python_flakehell_use_global            *g:ale_python_flakehell_use_global*
+                                             *b:ale_python_flakehell_use_global*
+  Type: |Number|
+  Default: `get(g:, 'ale_use_global_executables', 0)`
+
+  This variable controls whether or not ALE will search for flakehell in a
+  virtualenv directory first. If this variable is set to `1`, then ALE will
+  always use |g:ale_python_flakehell_executable| for the executable path.
+
+  Both variables can be set with `b:` buffer variables instead.
+
+
+g:ale_python_flakehell_auto_pipenv          *g:ale_python_flakehell_auto_pipenv*
+                                            *b:ale_python_flakehell_auto_pipenv*
+  Type: |Number|
+  Default: `0`
+
+  Detect whether the file is inside a pipenv, and set the executable to `pipenv`
+  if true. This is overridden by a manually-set executable.
+
+
+g:ale_python_flakehell_auto_poetry         *g:ale_python_flakehell_auto_poetry*
+                                           *b:ale_python_flakehell_auto_poetry*
+  Type: |Number|
+  Default: `0`
+
+  Detect whether the file is inside a poetry, and set the executable to `poetry`
+  if true. This is overridden by a manually-set executable.
 
 ===============================================================================
 isort                                                        *ale-python-isort*
@@ -356,6 +420,15 @@ g:ale_python_isort_auto_pipenv                 *g:ale_python_isort_auto_pipenv*
   if true. This is overridden by a manually-set executable.
 
 
+g:ale_python_isort_auto_poetry                 *g:ale_python_isort_auto_poetry*
+                                               *b:ale_python_isort_auto_poetry*
+  Type: |Number|
+  Default: `0`
+
+  Detect whether the file is inside a poetry, and set the executable to `poetry`
+  if true. This is overridden by a manually-set executable.
+
+
 ===============================================================================
 mypy                                                          *ale-python-mypy*
 
diff --git a/sources_non_forked/ale/doc/ale-robot.txt b/sources_non_forked/ale/doc/ale-robot.txt
new file mode 100644
index 00000000..405ae277
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-robot.txt
@@ -0,0 +1,16 @@
+===============================================================================
+ALE Robot Integration                                       *ale-robot-options*
+
+
+===============================================================================
+rflint                                                       *ale-robot-rflint*
+
+g:ale_robot_rflint_executable                   *g:ale_robot_rflint_executable*
+                                                *b:ale_robot_rflint_executable*
+  Type: |String|
+  Default: `'rflint'`
+
+
+===============================================================================
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
+
diff --git a/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt b/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt
index eaad7411..f98f9101 100644
--- a/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt
+++ b/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt
@@ -17,7 +17,7 @@ Notes:
   * `gcc`
   * `gnatpp`
 * Ansible
-  * `ansible-lint`
+  * `ansible-lint`!!
 * API Blueprint
   * `drafter`
 * APKBUILD
@@ -66,6 +66,7 @@ Notes:
   * `uncrustify`
 * C#
   * `csc`!!
+  * `dotnet-format`
   * `mcs`
   * `mcsc`!!
   * `uncrustify`
@@ -86,7 +87,7 @@ Notes:
   * `uncrustify`
 * Chef
   * `cookstyle`
-  * `foodcritic`
+  * `foodcritic`!!
 * Clojure
   * `clj-kondo`
   * `joker`
@@ -141,7 +142,7 @@ Notes:
 * Elixir
   * `credo`
   * `dialyxir`
-  * `dogma`
+  * `dogma`!!
   * `elixir-ls`
   * `mix`!!
 * Elm
@@ -150,12 +151,13 @@ Notes:
   * `elm-make`
 * Erb
   * `erb`
+  * `erblint`
   * `erubi`
   * `erubis`
   * `ruumba`
 * Erlang
   * `SyntaxErl`
-  * `dialyzer`
+  * `dialyzer`!!
   * `elvis`!!
   * `erlc`
   * `erlfmt`
@@ -183,6 +185,7 @@ Notes:
   * `goimports`
   * `golangci-lint`!!
   * `golangserver`
+  * `golines`
   * `golint`
   * `gometalinter`!!
   * `gopls`
@@ -240,13 +243,14 @@ Notes:
   * `ispc`!!
 * Java
   * `PMD`
-  * `checkstyle`
+  * `checkstyle`!!
   * `eclipselsp`
   * `google-java-format`
   * `javac`
   * `javalsp`
   * `uncrustify`
 * JavaScript
+  * `deno`
   * `eslint`
   * `fecs`
   * `flow`
@@ -259,16 +263,24 @@ Notes:
   * `tsserver`
   * `xo`
 * JSON
+  * `eslint`
   * `fixjson`
   * `jq`
   * `jsonlint`
   * `prettier`
   * `spectral`
+* JSON5
+  * `eslint`
+* JSONC
+  * `eslint`
+* Jsonnet
+  * `jsonnet-lint`
+  * `jsonnetfmt`
 * Julia
   * `languageserver`
 * Kotlin
   * `kotlinc`!!
-  * `ktlint`!!
+  * `ktlint`
   * `languageserver`
 * LaTeX (tex)
   * `alex`!!
@@ -389,8 +401,8 @@ Notes:
 * Prolog
   * `swipl`
 * proto
-  * `protoc-gen-lint`
-  * `protolint`
+  * `protoc-gen-lint`!!
+  * `protolint`!!
 * Pug
   * `pug-lint`
 * Puppet
@@ -399,6 +411,7 @@ Notes:
   * `puppet-lint`
 * PureScript
   * `purescript-language-server`
+  * `purs-tidy`
   * `purty`
 * Python
   * `autoflake`!!
@@ -407,9 +420,10 @@ Notes:
   * `bandit`
   * `black`
   * `flake8`
+  * `flakehell`
   * `isort`
   * `mypy`
-  * `prospector`
+  * `prospector`!!
   * `pycodestyle`
   * `pydocstyle`
   * `pyflakes`
@@ -446,10 +460,12 @@ Notes:
   * `textlint`
   * `vale`
   * `write-good`
+* Robot
+  * `rflint`
 * RPM spec
   * `rpmlint`
 * Ruby
-  * `brakeman`
+  * `brakeman`!!
   * `debride`
   * `prettier`
   * `rails_best_practices`!!
@@ -544,7 +560,7 @@ Notes:
   * `tsserver`
   * `typecheck`
 * V
-  * `v`
+  * `v`!!
   * `vfmt`
 * VALA
   * `uncrustify`
@@ -555,7 +571,7 @@ Notes:
   * `verilator`
   * `vlog`
   * `xvlog`
-  * `yosys`
+  * `yosys`!!
 * VHDL
   * `ghdl`
   * `vcom`
diff --git a/sources_non_forked/ale/doc/ale-typescript.txt b/sources_non_forked/ale/doc/ale-typescript.txt
index e2ee49c2..8984e183 100644
--- a/sources_non_forked/ale/doc/ale-typescript.txt
+++ b/sources_non_forked/ale/doc/ale-typescript.txt
@@ -23,7 +23,7 @@ g:ale_deno_lsp_project_root                       *g:ale_deno_lsp_project_root*
   executing the following steps in the given order:
 
   1. Find an ancestor directory containing a tsconfig.json.
-  2. Find an ancestory irectory containing a .git folder.
+  2. Find an ancestory directory containing a .git folder.
   3. Use the directory of the current buffer (if the buffer was opened from
      a file).
 
diff --git a/sources_non_forked/ale/doc/ale.txt b/sources_non_forked/ale/doc/ale.txt
index 2f77e7c1..97242748 100644
--- a/sources_non_forked/ale/doc/ale.txt
+++ b/sources_non_forked/ale/doc/ale.txt
@@ -1,4 +1,4 @@
-*ale.txt*	Plugin to lint and fix files asynchronously
+*ale.txt* Plugin to lint and fix files asynchronously
 *ale*
 
 ALE - Asynchronous Lint Engine
@@ -2226,8 +2226,6 @@ g:ale_virtualtext_cursor                             *g:ale_virtualtext_cursor*
   Type: |Number|
   Default: `0`
 
-  This option only has any effect in NeoVim.
-
   When this option is set to `1`, a message will be shown when a cursor is
   near a warning or error. ALE will attempt to find the warning or error at a
   column nearest to the cursor when the cursor is resting on a line which
@@ -2681,6 +2679,7 @@ documented in additional help files.
     uncrustify............................|ale-cpp-uncrustify|
   c#......................................|ale-cs-options|
     csc...................................|ale-cs-csc|
+    dotnet-format.........................|ale-cs-dotnet-format|
     mcs...................................|ale-cs-mcs|
     mcsc..................................|ale-cs-mcsc|
     uncrustify............................|ale-cs-uncrustify|
@@ -2730,6 +2729,7 @@ documented in additional help files.
     erlfmt................................|ale-erlang-erlfmt|
     syntaxerl.............................|ale-erlang-syntaxerl|
   eruby...................................|ale-eruby-options|
+    erblint...............................|ale-eruby-erblint|
     ruumba................................|ale-eruby-ruumba|
   fish....................................|ale-fish-options|
     fish_indent...........................|ale-fish-fish_indent|
@@ -2750,6 +2750,7 @@ documented in additional help files.
     gofmt.................................|ale-go-gofmt|
     golangci-lint.........................|ale-go-golangci-lint|
     golangserver..........................|ale-go-golangserver|
+    golines...............................|ale-go-golines|
     golint................................|ale-go-golint|
     gometalinter..........................|ale-go-gometalinter|
     gopls.................................|ale-go-gopls|
@@ -2811,6 +2812,7 @@ documented in additional help files.
     eclipselsp............................|ale-java-eclipselsp|
     uncrustify............................|ale-java-uncrustify|
   javascript..............................|ale-javascript-options|
+    deno..................................|ale-javascript-deno|
     eslint................................|ale-javascript-eslint|
     fecs..................................|ale-javascript-fecs|
     flow..................................|ale-javascript-flow|
@@ -2823,11 +2825,19 @@ documented in additional help files.
     standard..............................|ale-javascript-standard|
     xo....................................|ale-javascript-xo|
   json....................................|ale-json-options|
+    eslint................................|ale-json-eslint|
     fixjson...............................|ale-json-fixjson|
     jsonlint..............................|ale-json-jsonlint|
     jq....................................|ale-json-jq|
     prettier..............................|ale-json-prettier|
     spectral..............................|ale-json-spectral|
+  jsonc...................................|ale-jsonc-options|
+    eslint................................|ale-jsonc-eslint|
+  jsonnet.................................|ale-jsonnet-options|
+    jsonnetfmt............................|ale-jsonnet-jsonnetfmt|
+    jsonnet-lint..........................|ale-jsonnet-jsonnet-lint|
+  json5...................................|ale-json5-options|
+    eslint................................|ale-json5-eslint|
   julia...................................|ale-julia-options|
     languageserver........................|ale-julia-languageserver|
   kotlin..................................|ale-kotlin-options|
@@ -2933,6 +2943,7 @@ documented in additional help files.
     puppet-languageserver.................|ale-puppet-languageserver|
   purescript..............................|ale-purescript-options|
     purescript-language-server............|ale-purescript-language-server|
+    purs-tidy.............................|ale-purescript-tidy|
     purty.................................|ale-purescript-purty|
   pyrex (cython)..........................|ale-pyrex-options|
     cython................................|ale-pyrex-cython|
@@ -2943,6 +2954,7 @@ documented in additional help files.
     bandit................................|ale-python-bandit|
     black.................................|ale-python-black|
     flake8................................|ale-python-flake8|
+    flakehell.............................|ale-python-flakehell|
     isort.................................|ale-python-isort|
     mypy..................................|ale-python-mypy|
     prospector............................|ale-python-prospector|
@@ -2971,6 +2983,8 @@ documented in additional help files.
   restructuredtext........................|ale-restructuredtext-options|
     textlint..............................|ale-restructuredtext-textlint|
     write-good............................|ale-restructuredtext-write-good|
+  robot...................................|ale-robot-options|
+    rflint................................|ale-robot-rflint|
   ruby....................................|ale-ruby-options|
     brakeman..............................|ale-ruby-brakeman|
     debride...............................|ale-ruby-debride|
@@ -4300,6 +4314,13 @@ ALEJobStarted                                           *ALEJobStarted-autocmd*
   |ale#engine#IsCheckingBuffer()| over |ALELintPre-autocmd|, which is actually
   triggered before any linters are executed.
 
+ALELSPStarted                                           *ALELSPStarted-autocmd*
+                                                                *ALELSPStarted*
+
+  This |User| autocommand is trigged immediately after an LSP connection is
+  successfully initialized. This provides a way to perform any additional
+  initialization work, such as setting up buffer-level mappings.
+
 
 ALEWantResults                                         *ALEWantResults-autocmd*
                                                                *ALEWantResults*
diff --git a/sources_non_forked/ale/supported-tools.md b/sources_non_forked/ale/supported-tools.md
index 5f36287e..f643be5f 100644
--- a/sources_non_forked/ale/supported-tools.md
+++ b/sources_non_forked/ale/supported-tools.md
@@ -14,10 +14,10 @@ formatting.
 
 **Legend**
 
-|      Key      |             Definition           |
-| ------------- | -------------------------------- |
-| :floppy_disk: | May only run on files on disk    |
-|   :warning:   | Disabled by default              |
+|      Key      |             Definition                                            |
+| ------------- | ----------------------------------------------------------------- |
+| :floppy_disk: | May only run on files on disk (see: `help ale-lint-file-linters`  |
+|   :warning:   | Disabled by default                                               |
 
 ---
 
@@ -26,7 +26,7 @@ formatting.
   * [gcc](https://gcc.gnu.org)
   * [gnatpp](https://docs.adacore.com/gnat_ugn-docs/html/gnat_ugn/gnat_ugn/gnat_utility_programs.html#the-gnat-pretty-printer-gnatpp) :floppy_disk:
 * Ansible
-  * [ansible-lint](https://github.com/willthames/ansible-lint)
+  * [ansible-lint](https://github.com/willthames/ansible-lint) :floppy_disk:
 * API Blueprint
   * [drafter](https://github.com/apiaryio/drafter)
 * APKBUILD
@@ -75,6 +75,7 @@ formatting.
   * [uncrustify](https://github.com/uncrustify/uncrustify)
 * C#
   * [csc](http://www.mono-project.com/docs/about-mono/languages/csharp/) :floppy_disk: see:`help ale-cs-csc` for details and configuration
+  * [dotnet-format](https://github.com/dotnet/format)
   * [mcs](http://www.mono-project.com/docs/about-mono/languages/csharp/) see:`help ale-cs-mcs` for details
   * [mcsc](http://www.mono-project.com/docs/about-mono/languages/csharp/) :floppy_disk: see:`help ale-cs-mcsc` for details and configuration
   * [uncrustify](https://github.com/uncrustify/uncrustify)
@@ -95,7 +96,7 @@ formatting.
   * [uncrustify](https://github.com/uncrustify/uncrustify)
 * Chef
   * [cookstyle](https://docs.chef.io/cookstyle.html)
-  * [foodcritic](http://www.foodcritic.io/)
+  * [foodcritic](http://www.foodcritic.io/) :floppy_disk:
 * Clojure
   * [clj-kondo](https://github.com/borkdude/clj-kondo)
   * [joker](https://github.com/candid82/joker)
@@ -119,7 +120,7 @@ formatting.
   * [cucumber](https://cucumber.io/)
 * CUDA
   * [clangd](https://clang.llvm.org/extra/clangd.html)
-  * [nvcc](http://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html)
+  * [nvcc](http://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html) :floppy_disk:
 * Cypher
   * [cypher-lint](https://github.com/cleishm/libcypher-parser)
 * Cython (pyrex filetype)
@@ -134,9 +135,9 @@ formatting.
 * Dart
   * [analysis_server](https://github.com/dart-lang/sdk/tree/master/pkg/analysis_server)
   * [dart-analyze](https://github.com/dart-lang/sdk/tree/master/pkg/analyzer_cli) :floppy_disk:
-  * [dart-format](https://github.com/dart-lang/sdk/tree/master/utils/dartfmt)
+  * [dart-format](https://github.com/dart-lang/sdk/tree/master/utils/dartfmt) :floppy_disk:
   * [dartanalyzer](https://github.com/dart-lang/sdk/tree/master/pkg/analyzer_cli) :floppy_disk:
-  * [dartfmt](https://github.com/dart-lang/sdk/tree/master/utils/dartfmt)
+  * [dartfmt](https://github.com/dart-lang/sdk/tree/master/utils/dartfmt) :floppy_disk:
   * [language_server](https://github.com/natebosch/dart_language_server)
 * desktop
   * [desktop-file-validate](https://www.freedesktop.org/wiki/Software/desktop-file-utils/)
@@ -149,7 +150,7 @@ formatting.
   * [hadolint](https://github.com/hadolint/hadolint)
 * Elixir
   * [credo](https://github.com/rrrene/credo)
-  * [dialyxir](https://github.com/jeremyjh/dialyxir) :floppy_disk:
+  * [dialyxir](https://github.com/jeremyjh/dialyxir)
   * [dogma](https://github.com/lpil/dogma) :floppy_disk:
   * [elixir-ls](https://github.com/elixir-lsp/elixir-ls) :warning:
   * [mix](https://hexdocs.pm/mix/Mix.html) :warning: :floppy_disk:
@@ -159,12 +160,13 @@ formatting.
   * [elm-make](https://github.com/elm/compiler)
 * Erb
   * [erb](https://apidock.com/ruby/ERB)
+  * [erblint](https://github.com/Shopify/erb-lint)
   * [erubi](https://github.com/jeremyevans/erubi)
   * [erubis](https://github.com/kwatch/erubis)
   * [ruumba](https://github.com/ericqweinstein/ruumba)
 * Erlang
   * [SyntaxErl](https://github.com/ten0s/syntaxerl)
-  * [dialyzer](http://erlang.org/doc/man/dialyzer.html)
+  * [dialyzer](http://erlang.org/doc/man/dialyzer.html) :floppy_disk:
   * [elvis](https://github.com/inaka/elvis) :floppy_disk:
   * [erlc](http://erlang.org/doc/man/erlc.html)
   * [erlfmt](https://github.com/WhatsApp/erlfmt)
@@ -192,6 +194,7 @@ formatting.
   * [goimports](https://godoc.org/golang.org/x/tools/cmd/goimports) :warning:
   * [golangci-lint](https://github.com/golangci/golangci-lint) :warning: :floppy_disk:
   * [golangserver](https://github.com/sourcegraph/go-langserver) :warning:
+  * [golines](https://github.com/segmentio/golines)
   * [golint](https://godoc.org/github.com/golang/lint)
   * [gometalinter](https://github.com/alecthomas/gometalinter) :warning: :floppy_disk:
   * [gopls](https://github.com/golang/go/wiki/gopls)
@@ -249,13 +252,14 @@ formatting.
   * [ispc](https://ispc.github.io/) :floppy_disk:
 * Java
   * [PMD](https://pmd.github.io/)
-  * [checkstyle](http://checkstyle.sourceforge.net)
+  * [checkstyle](http://checkstyle.sourceforge.net) :floppy_disk:
   * [eclipselsp](https://github.com/eclipse/eclipse.jdt.ls)
   * [google-java-format](https://github.com/google/google-java-format)
   * [javac](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
   * [javalsp](https://github.com/georgewfraser/vscode-javac)
   * [uncrustify](https://github.com/uncrustify/uncrustify)
 * JavaScript
+  * [deno](https://deno.land/)
   * [eslint](http://eslint.org/)
   * [fecs](http://fecs.baidu.com/)
   * [flow](https://flowtype.org/)
@@ -268,16 +272,24 @@ formatting.
   * [tsserver](https://github.com/Microsoft/TypeScript/wiki/Standalone-Server-%28tsserver%29)
   * [xo](https://github.com/sindresorhus/xo)
 * JSON
+  * [eslint](http://eslint.org/)
   * [fixjson](https://github.com/rhysd/fixjson)
   * [jq](https://stedolan.github.io/jq/)
   * [jsonlint](https://github.com/zaach/jsonlint)
   * [prettier](https://github.com/prettier/prettier)
   * [spectral](https://github.com/stoplightio/spectral)
+* JSON5
+  * [eslint](http://eslint.org/)
+* JSONC
+  * [eslint](http://eslint.org/)
+* Jsonnet
+  * [jsonnet-lint](https://jsonnet.org/learning/tools.html)
+  * [jsonnetfmt](https://jsonnet.org/learning/tools.html)
 * Julia
   * [languageserver](https://github.com/JuliaEditorSupport/LanguageServer.jl)
 * Kotlin
   * [kotlinc](https://kotlinlang.org) :floppy_disk:
-  * [ktlint](https://ktlint.github.io) :floppy_disk:
+  * [ktlint](https://ktlint.github.io)
   * [languageserver](https://github.com/fwcd/KotlinLanguageServer) see `:help ale-integration-kotlin` for configuration instructions
 * LaTeX
   * [alex](https://github.com/wooorm/alex) :floppy_disk:
@@ -393,13 +405,13 @@ formatting.
 * Pony
   * [ponyc](https://github.com/ponylang/ponyc)
 * PowerShell
-  * [powershell](https://github.com/PowerShell/PowerShell) :floppy_disk:
-  * [psscriptanalyzer](https://github.com/PowerShell/PSScriptAnalyzer) :floppy_disk:
+  * [powershell](https://github.com/PowerShell/PowerShell)
+  * [psscriptanalyzer](https://github.com/PowerShell/PSScriptAnalyzer)
 * Prolog
   * [swipl](https://github.com/SWI-Prolog/swipl-devel)
 * proto
-  * [protoc-gen-lint](https://github.com/ckaznocha/protoc-gen-lint)
-  * [protolint](https://github.com/yoheimuta/protolint)
+  * [protoc-gen-lint](https://github.com/ckaznocha/protoc-gen-lint) :floppy_disk:
+  * [protolint](https://github.com/yoheimuta/protolint) :floppy_disk:
 * Pug
   * [pug-lint](https://github.com/pugjs/pug-lint)
 * Puppet
@@ -408,17 +420,19 @@ formatting.
   * [puppet-lint](https://puppet-lint.com)
 * PureScript
   * [purescript-language-server](https://github.com/nwolverson/purescript-language-server)
+  * [purs-tidy](https://github.com/natefaubion/purescript-tidy)
   * [purty](https://gitlab.com/joneshf/purty)
 * Python
-  * [autoflake](https://github.com/myint/autoflake)
+  * [autoflake](https://github.com/myint/autoflake) :floppy_disk:
   * [autoimport](https://lyz-code.github.io/autoimport/)
   * [autopep8](https://github.com/hhatto/autopep8)
   * [bandit](https://github.com/PyCQA/bandit) :warning:
   * [black](https://github.com/ambv/black)
   * [flake8](http://flake8.pycqa.org/en/latest/)
+  * [flakehell](https://github.com/flakehell/flakehell)
   * [isort](https://github.com/timothycrosley/isort)
   * [mypy](http://mypy-lang.org/)
-  * [prospector](https://github.com/PyCQA/prospector) :warning:
+  * [prospector](https://github.com/PyCQA/prospector) :warning: :floppy_disk:
   * [pycodestyle](https://github.com/PyCQA/pycodestyle) :warning:
   * [pydocstyle](https://www.pydocstyle.org/) :warning:
   * [pyflakes](https://github.com/PyCQA/pyflakes)
@@ -455,11 +469,13 @@ formatting.
   * [textlint](https://textlint.github.io/)
   * [vale](https://github.com/ValeLint/vale)
   * [write-good](https://github.com/btford/write-good)
+* Robot
+  * [rflint](https://github.com/boakley/robotframework-lint)
 * RPM spec
   * [rpmlint](https://github.com/rpm-software-management/rpmlint) :warning: (see `:help ale-integration-spec`)
 * Ruby
   * [brakeman](http://brakemanscanner.org/) :floppy_disk:
-  * [debride](https://github.com/seattlerb/debride) :floppy_disk:
+  * [debride](https://github.com/seattlerb/debride)
   * [prettier](https://github.com/prettier/plugin-ruby)
   * [rails_best_practices](https://github.com/flyerhzm/rails_best_practices) :floppy_disk:
   * [reek](https://github.com/troessner/reek)
@@ -553,7 +569,7 @@ formatting.
   * [tsserver](https://github.com/Microsoft/TypeScript/wiki/Standalone-Server-%28tsserver%29)
   * typecheck
 * V
-  * [v](https://github.com/vlang/v/)
+  * [v](https://github.com/vlang/v/) :floppy_disk:
   * [vfmt](https://github.com/vlang/v/)
 * VALA
   * [uncrustify](https://github.com/uncrustify/uncrustify)
@@ -564,7 +580,7 @@ formatting.
   * [verilator](http://www.veripool.org/projects/verilator/wiki/Intro)
   * [vlog](https://www.mentor.com/products/fv/questa/)
   * [xvlog](https://www.xilinx.com/products/design-tools/vivado.html)
-  * [yosys](http://www.clifford.at/yosys/)
+  * [yosys](http://www.clifford.at/yosys/) :floppy_disk:
 * VHDL
   * [ghdl](https://github.com/ghdl/ghdl)
   * [vcom](https://www.mentor.com/products/fv/questa/)
diff --git a/sources_non_forked/dracula/INSTALL.md b/sources_non_forked/dracula/INSTALL.md
index 5fb2210e..0868adcc 100644
--- a/sources_non_forked/dracula/INSTALL.md
+++ b/sources_non_forked/dracula/INSTALL.md
@@ -59,16 +59,20 @@ Place `colorscheme dracula` after `execute pathogen#infect()`.
 
 - If you [use vim + vundle](https://github.com/VundleVim/Vundle):
 
-    Plugin 'dracula/vim', { 'name': 'dracula' }
-    :PluginInstall
+```vim
+Plugin 'dracula/vim', { 'name': 'dracula' }
+:PluginInstall
+```
 
 Place `colorscheme dracula` after `call vundle#end()`.
 
 - If you [use vim-plug](https://github.com/junegunn/vim-plug) (\`as\` will install
 the plugin in a directory called 'dracula' instead of just 'vim'):
 
-    Plug 'dracula/vim', { 'as': 'dracula' }
-    :PlugInstall
+```vim
+Plug 'dracula/vim', { 'as': 'dracula' }
+:PlugInstall
+```
 
 Place `colorscheme dracula` after `call plug#end()`.
 
diff --git a/sources_non_forked/dracula/after/plugin/dracula.vim b/sources_non_forked/dracula/after/plugin/dracula.vim
index 61eaf5cf..b07898c5 100644
--- a/sources_non_forked/dracula/after/plugin/dracula.vim
+++ b/sources_non_forked/dracula/after/plugin/dracula.vim
@@ -62,6 +62,11 @@ if has('nvim-0.5') && luaeval("pcall(require, 'gitsigns')")
 endif
 " }}}
 " Tree-sitter: {{{
+" The nvim-treesitter library defines many global highlight groups that are
+" linked to the regular vim syntax highlight groups. We only need to redefine
+" those highlight groups when the defaults do not match the dracula
+" specification.
+" https://github.com/nvim-treesitter/nvim-treesitter/blob/master/plugin/nvim-treesitter.vim
 if exists('g:loaded_nvim_treesitter')
   " # Misc
   hi! link TSPunctSpecial Special
@@ -89,6 +94,9 @@ if exists('g:loaded_nvim_treesitter')
   hi! link TSTitle DraculaYellow
   hi! link TSLiteral DraculaYellow
   hi! link TSURI DraculaYellow
+  " HTML and JSX tag attributes. By default, this group is linked to TSProperty,
+  " which in turn links to Identifer (white).
+  hi! link TSTagAttribute DraculaGreenItalic
 endif
 " }}}
 
diff --git a/sources_non_forked/dracula/colors/dracula.vim b/sources_non_forked/dracula/colors/dracula.vim
index 14f6542f..8c941101 100644
--- a/sources_non_forked/dracula/colors/dracula.vim
+++ b/sources_non_forked/dracula/colors/dracula.vim
@@ -232,7 +232,7 @@ hi! link Question     DraculaFgBold
 hi! link Search       DraculaSearch
 call s:h('SignColumn', s:comment)
 hi! link TabLine      DraculaBoundary
-hi! link TabLineFill  DraculaBgDarker
+hi! link TabLineFill  DraculaBgDark
 hi! link TabLineSel   Normal
 hi! link Title        DraculaGreenBold
 hi! link VertSplit    DraculaBoundary
diff --git a/sources_non_forked/dracula/screenshot.png b/sources_non_forked/dracula/screenshot.png
index cf0a36e1..a6db5c67 100644
Binary files a/sources_non_forked/dracula/screenshot.png and b/sources_non_forked/dracula/screenshot.png differ
diff --git a/sources_non_forked/nerdtree/CHANGELOG.md b/sources_non_forked/nerdtree/CHANGELOG.md
index 8bbc8f2c..6e6893a4 100644
--- a/sources_non_forked/nerdtree/CHANGELOG.md
+++ b/sources_non_forked/nerdtree/CHANGELOG.md
@@ -5,6 +5,12 @@
         - **.PATCH**: Pull Request Title (PR Author) [PR Number](Link to PR)
 -->
 #### 6.10
+- **.16**: Fix documentation errors. (lifecrisis) [#1269](https://github.com/preservim/nerdtree/pull/1269)
+- **.15**: Ensure backward compatible testing of types. (lifecrisis) [#1266](https://github.com/preservim/nerdtree/pull/1266)
+- **.14**: Replace trim() with a version-compatible alternative. (PhilRunninger) [#1265](https://github.com/preservim/nerdtree/pull/1265)
+- **.13**: Change highlighting of bookmarks in the tree. (PhilRunninger) [#1261](https://github.com/preservim/nerdtree/pull/1261)
+- **.12**: Answer the question about accessing files over scp or ftp. (PhilRunninger) [#1259](https://github.com/preservim/nerdtree/pull/1259)
+- **.11**: Trim filenames created via the fs_menu (elanorigby) [#1243](https://github.com/preservim/nerdtree/pull/1243)
 - **.10**: Improve F.A.Q. Answers and Issue Templates (PhilRunninger) [#1249](https://github.com/preservim/nerdtree/pull/1249)
 - **.9**: `go` on a bookmark directory will NERDTreeFind it. (PhilRunninger) [#1236](https://github.com/preservim/nerdtree/pull/1236)
 - **.8**: Put `Callback` function variables in local scope. (PhilRunninger) [#1230](https://github.com/preservim/nerdtree/pull/1230)
diff --git a/sources_non_forked/nerdtree/README.markdown b/sources_non_forked/nerdtree/README.markdown
index ea10c119..2de10d6c 100644
--- a/sources_non_forked/nerdtree/README.markdown
+++ b/sources_non_forked/nerdtree/README.markdown
@@ -187,3 +187,35 @@ let g:NERDTreeDirArrowExpandable = '▸'
 let g:NERDTreeDirArrowCollapsible = '▾'
 ```
 The preceding values are the non-Windows default arrow symbols. Setting these variables to empty strings will remove the arrows completely and shift the entire tree two character positions to the left. See `:h NERDTreeDirArrowExpandable` for more details.
+
+### Can NERDTree access remote files via scp or ftp?
+
+Short answer: No, and there are no plans to add that functionality. However, Vim ships with a plugin that does just that. It's called netrw, and by adding the following lines to your `.vimrc`, you can use it to open files over the `scp:`, `ftp:`, or other protocols, while still using NERDTree for all local files. The function seamlessly makes the decision to open NERDTree or netrw, and other supported protocols can be added to the regular expression.
+
+```vim
+" Function to open the file or NERDTree or netrw.
+"   Returns: 1 if either file explorer was opened; otherwise, 0.
+function! s:OpenFileOrExplorer(...)
+    if a:0 == 0 || a:1 == ''
+        NERDTree
+    elseif filereadable(a:1)
+        execute 'edit '.a:1
+        return 0
+    elseif a:1 =~? '^\(scp\|ftp\)://' " Add other protocols as needed.
+        execute 'Vexplore '.a:1
+    elseif isdirectory(a:1)
+        execute 'NERDTree '.a:1
+    endif
+    return 1
+endfunction
+
+" Auto commands to handle OS commandline arguments
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc()==1 && !exists('s:std_in') | if <SID>OpenFileOrExplorer(argv()[0]) | wincmd p | enew | wincmd p | endif | endif
+
+" Command to call the OpenFileOrExplorer function.
+command! -n=? -complete=file -bar Edit :call <SID>OpenFileOrExplorer('<args>')
+
+" Command-mode abbreviation to replace the :edit Vim command.
+cnoreabbrev e Edit
+```
diff --git a/sources_non_forked/nerdtree/autoload/nerdtree.vim b/sources_non_forked/nerdtree/autoload/nerdtree.vim
index e6f687a0..ba708711 100644
--- a/sources_non_forked/nerdtree/autoload/nerdtree.vim
+++ b/sources_non_forked/nerdtree/autoload/nerdtree.vim
@@ -112,18 +112,18 @@ function! nerdtree#compareNodePaths(p1, p2) abort
         " Compare chunks upto common length.
         " If chunks have different type, the one which has
         " integer type is the lesser.
-        if type(sortKey1[i]) ==# type(sortKey2[i])
+        if type(sortKey1[i]) == type(sortKey2[i])
             if sortKey1[i] <# sortKey2[i]
                 return - 1
             elseif sortKey1[i] ># sortKey2[i]
                 return 1
             endif
-        elseif type(sortKey1[i]) ==# v:t_number
+        elseif type(sortKey1[i]) == type(0)
             return -1
-        elseif type(sortKey2[i]) ==# v:t_number
+        elseif type(sortKey2[i]) == type(0)
             return 1
         endif
-        let i = i + 1
+        let i += 1
     endwhile
 
     " Keys are identical upto common length.
diff --git a/sources_non_forked/nerdtree/doc/NERDTree.txt b/sources_non_forked/nerdtree/doc/NERDTree.txt
index 4e75ad13..55c25cd1 100644
--- a/sources_non_forked/nerdtree/doc/NERDTree.txt
+++ b/sources_non_forked/nerdtree/doc/NERDTree.txt
@@ -1256,10 +1256,10 @@ responsible pull request: https://github.com/preservim/nerdtree/pull/868.
 The default value of this variable depends on the features compiled into your
 vim and the values of |NERDTreeDirArrowCollapsible| and
 |NERDTreeDirArrowExpandable|.
-  * If your vim is compiled with the +conceal feature, it is the "\x07" (BELL)
-    character, and it is hidden by setting 'conceallevel' to 3. If you use
-    autocommands, make sure none of them change that setting in the NERDTree_*
-    buffers.
+  * If your vim is compiled with the +conceal feature, it is the "\x07"
+    (BEL) character, and it is hidden by setting 'conceallevel' to 2. If you
+    use autocommands, make sure none of them change that setting in the
+    NERD_Tree_* buffers.
   * If your vim does NOT have the +conceal feature and you're using "\u00a0"
     (non-breaking space) to hide the directory arrows, "\u00b7" (middle dot)
     is used as the default delimiter.
diff --git a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
index 09cb69b5..05bee60d 100644
--- a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
+++ b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
@@ -169,7 +169,7 @@ endfunction
 function! NERDTreeAddNode()
     let curDirNode = g:NERDTreeDirNode.GetSelected()
     let prompt = s:inputPrompt('add')
-    let newNodeName = input(prompt, curDirNode.path.str() . nerdtree#slash(), 'file')
+    let newNodeName = substitute(input(prompt, curDirNode.path.str() . nerdtree#slash(), 'file'), '\(^\s*\|\s*$\)', '', 'g')
 
     if newNodeName ==# ''
         call nerdtree#echo('Node Creation Aborted.')
@@ -206,7 +206,7 @@ function! NERDTreeMoveNode()
     let newNodePath = input(prompt, curNode.path.str(), 'file')
     while filereadable(newNodePath)
         call nerdtree#echoWarning('This destination already exists. Try again.')
-        let newNodePath = input(prompt, curNode.path.str(), 'file')
+        let newNodePath = substitute(input(prompt, curNode.path.str(), 'file'), '\(^\s*\|\s*$\)', '', 'g')
     endwhile
 
 
@@ -337,7 +337,7 @@ endfunction
 function! NERDTreeCopyNode()
     let currentNode = g:NERDTreeFileNode.GetSelected()
     let prompt = s:inputPrompt('copy')
-    let newNodePath = input(prompt, currentNode.path.str(), 'file')
+    let newNodePath = substitute(input(prompt, currentNode.path.str(), 'file'), '\(^\s*\|\s*$\)', '', 'g')
 
     if newNodePath !=# ''
         "strip trailing slash
diff --git a/sources_non_forked/nerdtree/syntax/nerdtree.vim b/sources_non_forked/nerdtree/syntax/nerdtree.vim
index bf523d15..c4197eef 100644
--- a/sources_non_forked/nerdtree/syntax/nerdtree.vim
+++ b/sources_non_forked/nerdtree/syntax/nerdtree.vim
@@ -36,23 +36,23 @@ if g:NERDTreeDirArrowExpandable !=# ''
     exec 'syn match NERDTreeOpenable #' . escape(g:NERDTreeDirArrowExpandable, '~') . '\ze .*/# containedin=NERDTreeDir,NERDTreeFile'
     let s:dirArrows = escape(g:NERDTreeDirArrowCollapsible, '~]\-').escape(g:NERDTreeDirArrowExpandable, '~]\-')
     exec 'syn match NERDTreeDir #[^'.s:dirArrows.' ].*/#'
-    exec 'syn match NERDTreeExecFile #^.*'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark'
-    exec 'syn match NERDTreeFile  #^[^"\.'.s:dirArrows.'] *[^'.s:dirArrows.']*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'
+    exec 'syn match NERDTreeExecFile #^.*'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmarkName'
+    exec 'syn match NERDTreeFile  #^[^"\.'.s:dirArrows.'] *[^'.s:dirArrows.']*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmarkName,NERDTreeExecFile'
 else
     exec 'syn match NERDTreeDir #[^'.g:NERDTreeNodeDelimiter.']\{-}/\ze\($\|'.g:NERDTreeNodeDelimiter.'\)#'
-    exec 'syn match NERDTreeExecFile #[^'.g:NERDTreeNodeDelimiter.']\{-}'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark'
-    exec 'syn match NERDTreeFile     #^.*'.g:NERDTreeNodeDelimiter.'.*[^\/]\($\|'.g:NERDTreeNodeDelimiter.'.*\)# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'
+    exec 'syn match NERDTreeExecFile #[^'.g:NERDTreeNodeDelimiter.']\{-}'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmarkName'
+    exec 'syn match NERDTreeFile     #^.*'.g:NERDTreeNodeDelimiter.'.*[^\/]\($\|'.g:NERDTreeNodeDelimiter.'.*\)# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmarkName,NERDTreeExecFile'
 endif
 
 "highlighting for readonly files
-exec 'syn match NERDTreeRO #.*'.g:NERDTreeNodeDelimiter.'\zs.*\ze'.g:NERDTreeNodeDelimiter.'.*\['.g:NERDTreeGlyphReadOnly.'\]# contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreeFile'
+exec 'syn match NERDTreeRO #.*'.g:NERDTreeNodeDelimiter.'\zs.*\ze'.g:NERDTreeNodeDelimiter.'.*\['.g:NERDTreeGlyphReadOnly.'\]# contains=NERDTreeIgnore,NERDTreeBookmarkName,NERDTreeFile'
 
 exec 'syn match NERDTreeFlags #\[[^\]]*\]\ze'.g:NERDTreeNodeDelimiter.'# containedin=NERDTreeFile,NERDTreeExecFile,NERDTreeLinkFile,NERDTreeRO,NERDTreeDir'
 
 syn match NERDTreeCWD #^[</].*$#
 
 "highlighting for bookmarks
-syn match NERDTreeBookmark # {.*}#hs=s+1
+syn match NERDTreeBookmarkName # {.*}#hs=s+2,he=e-1
 
 "highlighting for the bookmarks table
 syn match NERDTreeBookmarksLeader #^>#
diff --git a/sources_non_forked/nginx.vim/LICENSE b/sources_non_forked/nginx.vim/LICENSE
deleted file mode 100644
index 536790d3..00000000
--- a/sources_non_forked/nginx.vim/LICENSE
+++ /dev/null
@@ -1,675 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    Vim plugin that highlights insecure SSL/TLS cipher suites and protocols.
-    Copyright (C) 2017  Chris Aumann
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    nginx.vim  Copyright (C) 2017  Chris Aumann
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
diff --git a/sources_non_forked/nginx.vim/README.md b/sources_non_forked/nginx.vim/README.md
index 6a2bafaf..11f865b9 100644
--- a/sources_non_forked/nginx.vim/README.md
+++ b/sources_non_forked/nginx.vim/README.md
@@ -84,3 +84,9 @@ git clone https://github.com/chr4/nginx.vim ~/.vim/bundle/nginx.vim
 ```
 
 Optionally, if you like [Jinja](http://jinja.pocoo.org/) template syntax highlighting, install `lepture/vim-jinja`, too.
+
+
+## License
+
+Copyright (c) Chris Aumann.  Distributed under the same terms as Vim itself.
+See `:help license`.
diff --git a/sources_non_forked/nginx.vim/ftplugin/nginx.vim b/sources_non_forked/nginx.vim/ftplugin/nginx.vim
index 463eea98..cfedff87 100644
--- a/sources_non_forked/nginx.vim/ftplugin/nginx.vim
+++ b/sources_non_forked/nginx.vim/ftplugin/nginx.vim
@@ -1 +1,5 @@
+setlocal comments=:#
 setlocal commentstring=#\ %s
+setlocal formatoptions+=croql formatoptions-=t
+
+let b:undo_ftplugin = "setl fo< cms< com<"
diff --git a/sources_non_forked/nginx.vim/indent/nginx.vim b/sources_non_forked/nginx.vim/indent/nginx.vim
index 86013668..7a0123cc 100644
--- a/sources_non_forked/nginx.vim/indent/nginx.vim
+++ b/sources_non_forked/nginx.vim/indent/nginx.vim
@@ -9,3 +9,5 @@ setlocal indentexpr=
 setlocal cindent
 " Just make sure that the comments are not reset as defs would be.
 setlocal cinkeys-=0#
+
+let b:undo_indent = "setl cin< cink< inde<"
diff --git a/sources_non_forked/rust.vim/.github/workflows/ci.yml b/sources_non_forked/rust.vim/.github/workflows/ci.yml
new file mode 100644
index 00000000..bd6e2265
--- /dev/null
+++ b/sources_non_forked/rust.vim/.github/workflows/ci.yml
@@ -0,0 +1,9 @@
+on: push
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run tests
+        run: cd test && ./run-tests
+        shell: bash
diff --git a/sources_non_forked/rust.vim/.travis.yml b/sources_non_forked/rust.vim/.travis.yml
deleted file mode 100644
index fa69300e..00000000
--- a/sources_non_forked/rust.vim/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-sudo: required
-services:
-    - docker
-language: generic
-script: |
-    cd test && ./run-tests
diff --git a/sources_non_forked/rust.vim/ISSUE_TEMPLATE.md b/sources_non_forked/rust.vim/ISSUE_TEMPLATE.md
index 10afd155..cf8c71bb 100644
--- a/sources_non_forked/rust.vim/ISSUE_TEMPLATE.md
+++ b/sources_non_forked/rust.vim/ISSUE_TEMPLATE.md
@@ -23,5 +23,6 @@ _?_
 
 Paste debugging info from the Rust Vim plugin via _one_ of the following
 commands: `:RustInfo`,  `:RustInfoToClipboard`, or `:RustInfoToFile <filename>`.
+<!-- To ensure these commands are available, open a Rust source file first. -->
 
 _?_
diff --git a/sources_non_forked/rust.vim/autoload/rustfmt.vim b/sources_non_forked/rust.vim/autoload/rustfmt.vim
index 5283b840..59a58e84 100644
--- a/sources_non_forked/rust.vim/autoload/rustfmt.vim
+++ b/sources_non_forked/rust.vim/autoload/rustfmt.vim
@@ -157,14 +157,7 @@ function! s:RunRustfmt(command, tmpname, from_writepre)
         endif
 
         call s:DeleteLines(len(l:content), line('$'))
-        if has('nvim') && exists('*nvim_buf_set_lines')
-            " setline() gets called for every item on the array,
-            " this results on the neovim buffer callbacks being called n times,
-            " using nvim_buf_set_lines() makes the change in one call.
-            call nvim_buf_set_lines(0, 0, -1, v:true, l:content)
-        else
-            call setline(1, l:content)
-        endif
+        call setline(1, l:content)
 
         " only clear location list if it was previously filled to prevent
         " clobbering other additions
diff --git a/sources_non_forked/rust.vim/indent/rust.vim b/sources_non_forked/rust.vim/indent/rust.vim
index 6edce73f..e0c847cb 100644
--- a/sources_non_forked/rust.vim/indent/rust.vim
+++ b/sources_non_forked/rust.vim/indent/rust.vim
@@ -24,6 +24,8 @@ setlocal indentkeys=0{,0},!^F,o,O,0[,0],0(,0)
 
 setlocal indentexpr=GetRustIndent(v:lnum)
 
+let b:undo_indent = "setlocal cindent< cinoptions< cinkeys< cinwords< lisp< autoindent< indentkeys< indentexpr<"
+
 " Only define the function once.
 if exists("*GetRustIndent")
     finish
diff --git a/sources_non_forked/rust.vim/test/run-tests b/sources_non_forked/rust.vim/test/run-tests
index a8c63b60..9e11ba5c 100644
--- a/sources_non_forked/rust.vim/test/run-tests
+++ b/sources_non_forked/rust.vim/test/run-tests
@@ -67,9 +67,9 @@ def image_exists():
 def tests_on_docker():
     res = docker_run("bash -lc 'python /home/vimtest/run-tests inside-docker'", ok_fail=True)
     if res == 0:
-        print "Tests OK"
+        print("Tests OK")
     else:
-        print "Tests Failed"
+        print("Tests Failed")
         sys.exit(1)
 
 def inside_docker():
@@ -92,7 +92,7 @@ def main():
         return
 
     if not image_exists():
-        print "Need to take image from remote"
+        print("Need to take image from remote")
         system("docker pull %s" % (IMAGE, ))
 
     if "-i" in sys.argv[1:]:
diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
index 7dfc96c4..2c81622a 100644
--- a/sources_non_forked/vim-commentary/plugin/commentary.vim
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -36,6 +36,7 @@ function! s:go(...) abort
 
   let [l, r] = s:surroundings()
   let uncomment = 2
+  let force_uncomment = a:0 > 2 && a:3
   for lnum in range(lnum1,lnum2)
     let line = matchstr(getline(lnum),'\S.*\s\@<!')
     let [l, r] = s:strip_white_space(l,r,line)
@@ -58,7 +59,11 @@ function! s:go(...) abort
             \'\M' . substitute(l, '\ze\S\s*$', '\\zs\\d\\*\\ze', '') . '\|' . substitute(r, '\S\zs', '\\zs\\d\\*\\ze', ''),
             \'\=substitute(submatch(0)+1-uncomment,"^0$\\|^-\\d*$","","")','g')
     endif
-    if uncomment
+    if force_uncomment
+      if line =~ '^\s*' . l
+        let line = substitute(line,'\S.*\s\@<!','\=submatch(0)[strlen(l):-strlen(r)-1]','')
+      endif
+    elseif uncomment
       let line = substitute(line,'\S.*\s\@<!','\=submatch(0)[strlen(l):-strlen(r)-1]','')
     else
       let line = substitute(line,'^\%('.matchstr(getline(lnum1),indent).'\|\s*\)\zs.*\S\@<=','\=l.submatch(0).r','')
@@ -97,7 +102,7 @@ function! s:textobject(inner) abort
   endif
 endfunction
 
-command! -range -bar Commentary call s:go(<line1>,<line2>)
+command! -range -bar -bang Commentary call s:go(<line1>,<line2>,<bang>0)
 xnoremap <expr>   <Plug>Commentary     <SID>go()
 nnoremap <expr>   <Plug>Commentary     <SID>go()
 nnoremap <expr>   <Plug>CommentaryLine <SID>go() . '_'
diff --git a/sources_non_forked/vim-fugitive/autoload/fugitive.vim b/sources_non_forked/vim-fugitive/autoload/fugitive.vim
index 9816233f..a7303daa 100644
--- a/sources_non_forked/vim-fugitive/autoload/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/autoload/fugitive.vim
@@ -38,6 +38,14 @@ function! s:Uniq(list) abort
   return a:list
 endfunction
 
+function! s:JoinChomp(list) abort
+  if empty(a:list[-1])
+    return join(a:list[0:-2], "\n")
+  else
+    return join(a:list, "\n")
+  endif
+endfunction
+
 function! s:winshell() abort
   return has('win32') && &shellcmdflag !~# '^-'
 endfunction
@@ -80,9 +88,13 @@ function! s:throw(string) abort
 endfunction
 
 function! s:VersionCheck() abort
-  if v:version < 704
-    return 'return ' . string('echoerr "fugitive: Vim 7.4 or newer required"')
+  if v:version < 703
+    return 'return ' . string('echoerr "fugitive: Vim 7.3 or newer required"')
   elseif empty(fugitive#GitVersion())
+    let exe = get(s:GitCmd(), 0, '')
+    if len(exe) && !executable(exe)
+      return 'return ' . string('echoerr "fugitive: cannot find ' . string(exe) . ' in PATH"')
+    endif
     return 'return ' . string('echoerr "fugitive: cannot execute Git"')
   elseif !fugitive#GitVersion(1, 8, 5)
     return 'return ' . string('echoerr "fugitive: Git 1.8.5 or newer required"')
@@ -97,7 +109,7 @@ function! s:DirCheck(...) abort
   if !empty(vcheck)
     return vcheck
   endif
-  let dir = a:0 ? s:Dir(a:1) : s:Dir()
+  let dir = call('FugitiveGitDir', a:000)
   if !empty(dir) && FugitiveWorkTree(dir, 1) is# 0
     return 'return ' . string('echoerr "fugitive: ' . s:worktree_error . '"')
   elseif !empty(dir)
@@ -113,7 +125,15 @@ function! s:Mods(mods, ...) abort
   let mods = substitute(a:mods, '\C<mods>', '', '')
   let mods = mods =~# '\S$' ? mods . ' ' : mods
   if a:0 && mods !~# '\<\%(aboveleft\|belowright\|leftabove\|rightbelow\|topleft\|botright\|tab\)\>'
-    let mods = a:1 . ' ' . mods
+    if a:1 ==# 'Edge'
+      if mods =~# '\<vertical\>' ? &splitright : &splitbelow
+        let mods = 'botright ' . mods
+      else
+        let mods = 'topleft ' . mods
+      endif
+    else
+      let mods = a:1 . ' ' . mods
+    endif
   endif
   return substitute(mods, '\s\+', ' ', 'g')
 endfunction
@@ -174,46 +194,48 @@ function! s:TempScript(...) abort
   return FugitiveGitPath(temp)
 endfunction
 
-function! s:DoAutocmd(cmd) abort
+function! s:DoAutocmd(...) abort
   if v:version >= 704 || (v:version == 703 && has('patch442'))
-    return 'doautocmd <nomodeline>' . a:cmd
+    return join(map(copy(a:000), "'doautocmd <nomodeline>' . v:val"), '|')
   elseif &modelines > 0
-    return 'try|set modelines=0|doautocmd ' . a:cmd . '|finally|set modelines=' . &modelines . '|endtry'
+    return 'try|set modelines=0|' . join(map(copy(a:000), "'doautocmd ' . v:val"), '|') . '|finally|set modelines=' . &modelines . '|endtry'
   else
-    return 'doautocmd ' . a:cmd
+    return join(map(copy(a:000), "'doautocmd ' . v:val"), '|')
   endif
 endfunction
 
 let s:nowait = v:version >= 704 ? '<nowait>' : ''
 
 function! s:Map(mode, lhs, rhs, ...) abort
+  let maps = []
   for mode in split(a:mode, '\zs')
+    let skip = 0
     let flags = (a:0 ? a:1 : '') . (a:rhs =~# '<Plug>' ? '' : '<script>')
     let head = a:lhs
     let tail = ''
     let keys = get(g:, mode.'remap', {})
     if type(keys) == type([])
-      return
+      continue
     endif
     while !empty(head)
       if has_key(keys, head)
         let head = keys[head]
-        if empty(head)
-          return
-        endif
+        let skip = empty(head)
         break
       endif
       let tail = matchstr(head, '<[^<>]*>$\|.$') . tail
       let head = substitute(head, '<[^<>]*>$\|.$', '', '')
     endwhile
-    if flags !~# '<unique>' || empty(mapcheck(head.tail, mode))
-      exe mode.'map <buffer>' s:nowait flags head.tail a:rhs
+    if !skip && (flags !~# '<unique>' || empty(mapcheck(head.tail, mode)))
+      call add(maps, mode.'map <buffer>' . s:nowait . substitute(flags, '<unique>', '', '') . ' ' . head.tail . ' ' . a:rhs)
       if a:0 > 1
         let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') .
               \ '|sil! exe "' . mode . 'unmap <buffer> ' . head.tail . '"'
       endif
     endif
   endfor
+  exe join(maps, '|')
+  return ''
 endfunction
 
 function! fugitive#Autowrite() abort
@@ -233,6 +255,106 @@ function! fugitive#Autowrite() abort
   return ''
 endfunction
 
+function! fugitive#Wait(job_or_jobs, ...) abort
+  let jobs = type(a:job_or_jobs) == type([]) ? copy(a:job_or_jobs) : [a:job_or_jobs]
+  call map(jobs, 'type(v:val) ==# type({}) ? get(v:val, "job", "") : v:val')
+  call filter(jobs, 'type(v:val) !=# type("")')
+  let timeout_ms = a:0 ? a:1 : -1
+  if exists('*jobwait')
+    call map(copy(jobs), 'chanclose(v:val, "stdin")')
+    call jobwait(jobs, timeout_ms)
+    if len(jobs) && has('nvim-0.5')
+      sleep 1m
+    endif
+  else
+    let sleep = has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m'
+    for job in jobs
+      if ch_status(job) !=# 'closed'
+        call ch_close_in(job)
+      endif
+    endfor
+    let i = 0
+    for job in jobs
+      while ch_status(job) !=# 'closed' || job_status(job) ==# 'run'
+        if i == timeout_ms
+          break
+        endif
+        let i += 1
+        exe sleep
+      endwhile
+    endfor
+  endif
+  return a:job_or_jobs
+endfunction
+
+function! s:JobVimExit(dict, callback, temp, job, status) abort
+  let a:dict.exit_status = a:status
+  let a:dict.stderr = readfile(a:temp . '.err', 'b')
+  call delete(a:temp . '.err')
+  let a:dict.stdout = readfile(a:temp . '.out', 'b')
+  call delete(a:temp . '.out')
+  call delete(a:temp . '.in')
+  call remove(a:dict, 'job')
+  call call(a:callback[0], [a:dict] + a:callback[1:-1])
+endfunction
+
+function! s:JobNvimExit(dict, callback, job, data, type) dict abort
+  let a:dict.stdout = self.stdout
+  let a:dict.stderr = self.stderr
+  let a:dict.exit_status = a:data
+  call remove(a:dict, 'job')
+  call call(a:callback[0], [a:dict] + a:callback[1:-1])
+endfunction
+
+function! s:JobExecute(argv, jopts, stdin, callback, ...) abort
+  let dict = a:0 ? a:1 : {}
+  let cb = len(a:callback) ? a:callback : [function('len')]
+  if exists('*jobstart')
+    call extend(a:jopts, {
+          \ 'stdout_buffered': v:true,
+          \ 'stderr_buffered': v:true,
+          \ 'on_exit': function('s:JobNvimExit', [dict, cb])})
+    let dict.job = jobstart(a:argv, a:jopts)
+    if !empty(a:stdin)
+      call chansend(dict.job, a:stdin)
+      call chanclose(dict.job, 'stdin')
+    endif
+  elseif exists('*job_start')
+    let temp = tempname()
+    call extend(a:jopts, {
+          \ 'out_io': 'file',
+          \ 'out_name': temp . '.out',
+          \ 'err_io': 'file',
+          \ 'err_name': temp . '.err',
+          \ 'exit_cb': function('s:JobVimExit', [dict, cb, temp])})
+    if a:stdin ==# ['']
+      let a:jopts.in_io = 'null'
+    elseif !empty(a:stdin)
+      let a:jopts.in_io = 'file'
+      let a:jopts.in_name = temp . '.in'
+      call writefile(a:stdin, a:jopts.in_name, 'b')
+    endif
+    let dict.job = job_start(a:argv, a:jopts)
+  elseif &shell !~# 'sh' || &shell =~# 'fish\|\%(powershell\|pwsh\)\%(\.exe\)\=$'
+    throw 'fugitive: Vim 8 or higher required to use ' . &shell
+  else
+    let cmd = s:shellesc(a:argv)
+    let outfile = tempname()
+    try
+      let dict.stderr = split(system(' (' . cmd . ' >' . outfile . ') ', join(a:stdin, "\n")), "\n", 1)
+      let dict.exit_status = v:shell_error
+      let dict.stdout = readfile(outfile, 'b')
+      call call(cb[0], [dict] + cb[1:-1])
+    finally
+      call delete(outfile)
+    endtry
+  endif
+  if empty(a:callback)
+    call fugitive#Wait(dict)
+  endif
+  return dict
+endfunction
+
 function! s:add_methods(namespace, method_names) abort
   for name in a:method_names
     let s:{a:namespace}_prototype[name] = s:function('s:'.a:namespace.'_'.name)
@@ -241,6 +363,8 @@ endfunction
 
 " Section: Git
 
+let s:run_jobs = (exists('*job_start') || exists('*jobstart')) && exists('*bufwinid')
+
 function! s:GitCmd() abort
   if !exists('g:fugitive_git_executable')
     return ['git']
@@ -296,9 +420,9 @@ function! s:UserCommandList(...) abort
   if a:0 && type(a:1) == type({})
     let git = copy(get(a:1, 'git', git))
     let flags = get(a:1, 'flags', flags)
-    let dir = a:1.dir
+    let dir = a:1.git_dir
   elseif a:0
-    let dir = a:1
+    let dir = s:GitDir(a:1)
   else
     let dir = ''
   endif
@@ -306,22 +430,23 @@ function! s:UserCommandList(...) abort
     let tree = s:Tree(dir)
     if empty(tree)
       call add(git, '--git-dir=' . FugitiveGitPath(dir))
-    elseif len(tree) && s:cpath(tree) !=# s:cpath(getcwd())
-      call extend(git, ['-C', FugitiveGitPath(tree)])
+    else
+      if !s:cpath(tree . '/.git', dir) || len($GIT_DIR)
+        call add(git, '--git-dir=' . FugitiveGitPath(dir))
+      endif
+      if !s:cpath(tree, getcwd())
+        call extend(git, ['-C', FugitiveGitPath(tree)])
+      endif
     endif
   endif
   return git + flags
 endfunction
 
-function! s:UserCommand(...) abort
-  return s:shellesc(call('s:UserCommandList', a:0 ? [a:1] : []) + (a:0 ? a:2 : []))
-endfunction
-
 let s:git_versions = {}
 function! fugitive#GitVersion(...) abort
   let git = s:GitShellCmd()
   if !has_key(s:git_versions, git)
-    let s:git_versions[git] = matchstr(s:SystemError(s:GitCmd() + ['--version'])[0], '\d[^[:space:]]\+')
+    let s:git_versions[git] = matchstr(get(s:JobExecute(s:GitCmd() + ['--version'], {}, [], [], {}).stdout, 0, ''), '\d[^[:space:]]\+')
   endif
   if !a:0
     return s:git_versions[git]
@@ -366,6 +491,14 @@ function! s:Dir(...) abort
   return a:0 ? FugitiveGitDir(a:1) : FugitiveGitDir()
 endfunction
 
+function! s:GitDir(...) abort
+  return a:0 ? FugitiveGitDir(a:1) : FugitiveGitDir()
+endfunction
+
+function! s:DirUrlPrefix(...) abort
+  return 'fugitive://' . call('s:GitDir', a:000) . '//'
+endfunction
+
 function! s:Tree(...) abort
   return a:0 ? FugitiveWorkTree(a:1) : FugitiveWorkTree()
 endfunction
@@ -386,54 +519,98 @@ function! s:HasOpt(args, ...) abort
   endfor
 endfunction
 
-function! s:PreparePathArgs(cmd, dir, literal) abort
-  if a:literal
+function! s:PreparePathArgs(cmd, dir, literal, explicit) abort
+  if !a:explicit
     call insert(a:cmd, '--literal-pathspecs')
   endif
   let split = index(a:cmd, '--')
   for i in range(split < 0 ? len(a:cmd) : split)
-    if type(a:cmd[i]) == type(0)
-      let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), './', a:dir)
-    endif
+      if type(a:cmd[i]) == type(0)
+        if a:literal
+          let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), './', a:dir)
+        else
+          let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), ':(top,literal)', a:dir)
+        endif
+      endif
   endfor
   if split < 0
     return a:cmd
   endif
   for i in range(split + 1, len(a:cmd) - 1)
     if type(a:cmd[i]) == type(0)
-      let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), './', a:dir)
-    elseif a:literal
+      if a:literal
+        let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), './', a:dir)
+      else
+        let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), ':(top,literal)', a:dir)
+      endif
+    elseif !a:explicit
       let a:cmd[i] = fugitive#Path(a:cmd[i], './', a:dir)
     endif
   endfor
   return a:cmd
 endfunction
 
+function! s:PrepareEnv(env, dir) abort
+  if len($GIT_INDEX_FILE) && len(s:Tree(a:dir)) && !has_key(a:env, 'GIT_INDEX_FILE')
+    let index_dir = substitute($GIT_INDEX_FILE, '[^/]\+$', '', '')
+    let our_dir = fugitive#Find('.git/', a:dir)
+    if !s:cpath(index_dir, our_dir) && !s:cpath(resolve(FugitiveVimPath(index_dir)), our_dir)
+      let a:env['GIT_INDEX_FILE'] = FugitiveGitPath(fugitive#Find('.git/index', a:dir))
+    endif
+  endif
+  if len($GIT_WORK_TREE)
+    let a:env['GIT_WORK_TREE'] = '.'
+  endif
+endfunction
+
 let s:prepare_env = {
       \ 'sequence.editor': 'GIT_SEQUENCE_EDITOR',
       \ 'core.editor': 'GIT_EDITOR',
       \ 'core.askpass': 'GIT_ASKPASS',
       \ }
-function! fugitive#PrepareDirEnvGitArgv(...) abort
+function! fugitive#PrepareDirEnvGitFlagsArgs(...) abort
   if !fugitive#GitVersion(1, 8, 5)
     throw 'fugitive: Git 1.8.5 or higher required'
   endif
   let git = s:GitCmd()
-  if a:0 && type(a:1) ==# type([])
-    let cmd = a:000[1:-1] + a:1
+  if a:0 == 1 && type(a:1) == type({}) && has_key(a:1, 'git_dir') && has_key(a:1, 'flags') && has_key(a:1, 'args')
+    let cmd = a:1.flags + a:1.args
+    let dir = a:1.git_dir
+    if has_key(a:1, 'git')
+      let git = a:1.git
+    endif
+    let env = get(a:1, 'env', {})
   else
-    let cmd = copy(a:000)
+    let list_args = []
+    let cmd = []
+    for arg in a:000
+      if type(arg) ==# type([])
+        call extend(list_args, arg)
+      else
+        call add(cmd, arg)
+      endif
+    endfor
+    call extend(cmd, list_args)
+    let env = {}
   endif
-  let env = {}
+  let autoenv = {}
+  let explicit_pathspec_option = 0
+  let literal_pathspecs = 1
   let i = 0
+  let arg_count = 0
   while i < len(cmd)
     if type(cmd[i]) == type({})
-      if has_key(cmd[i], 'dir')
+      if has_key(cmd[i], 'git_dir')
+        let dir = cmd[i].git_dir
+      elseif has_key(cmd[i], 'dir')
         let dir = cmd[i].dir
       endif
       if has_key(cmd[i], 'git')
         let git = cmd[i].git
       endif
+      if has_key(cmd[i], 'env')
+        call extend(env, cmd[i].env)
+      endif
       call remove(cmd, i)
     elseif cmd[i] =~# '^$\|[\/.]' && cmd[i] !~# '^-'
       let dir = remove(cmd, i)
@@ -443,20 +620,18 @@ function! fugitive#PrepareDirEnvGitArgv(...) abort
       let dir = s:Dir(remove(cmd, i))
     elseif cmd[i] ==# '-c' && len(cmd) > i + 1
       let key = matchstr(cmd[i+1], '^[^=]*')
-      if has_key(s:prepare_env, tolower(key)) || key !~# '\.'
-        let var = get(s:prepare_env, tolower(key), key)
+      if has_key(s:prepare_env, tolower(key))
+        let var = s:prepare_env[tolower(key)]
         let val = matchstr(cmd[i+1], '=\zs.*')
-        let env[var] = val
-      endif
-      if cmd[i+1] =~# '\.'
-        let i += 2
-      else
-        call remove(cmd, i, i + 1)
+        let autoenv[var] = val
       endif
+      let i += 2
     elseif cmd[i] =~# '^--.*pathspecs$'
+      let literal_pathspecs = (cmd[i] ==# '--literal-pathspecs')
       let explicit_pathspec_option = 1
       let i += 1
     elseif cmd[i] !~# '^-'
+      let arg_count = len(cmd) - i
       break
     else
       let i += 1
@@ -465,8 +640,13 @@ function! fugitive#PrepareDirEnvGitArgv(...) abort
   if !exists('dir')
     let dir = s:Dir()
   endif
-  call s:PreparePathArgs(cmd, dir, !exists('explicit_pathspec_option'))
-  return [dir, env, git, cmd]
+  call extend(autoenv, env)
+  call s:PrepareEnv(autoenv, dir)
+  if len($GPG_TTY) && !has_key(autoenv, 'GPG_TTY')
+    let autoenv.GPG_TTY = ''
+  endif
+  call s:PreparePathArgs(cmd, dir, literal_pathspecs, explicit_pathspec_option)
+  return [s:GitDir(dir), env, extend(autoenv, env), git, cmd[0 : -arg_count-1], arg_count ? cmd[-arg_count : -1] : []]
 endfunction
 
 function! s:BuildEnvPrefix(env) abort
@@ -474,7 +654,7 @@ function! s:BuildEnvPrefix(env) abort
   let env = items(a:env)
   if empty(env)
     return ''
-  elseif &shell =~? '\%(powershell\|pwsh\)\%(\.exe\)\=$'
+  elseif &shell =~# '\%(powershell\|pwsh\)\%(\.exe\)\=$'
     return join(map(env, '"$Env:" . v:val[0] . " = ''" . substitute(v:val[1], "''", "''''", "g") . "''; "'), '')
   elseif s:winshell()
     return join(map(env, '"set " . substitute(join(v:val, "="), "[&|<>^]", "^^^&", "g") . "& "'), '')
@@ -486,7 +666,9 @@ endfunction
 function! s:JobOpts(cmd, env) abort
   if empty(a:env)
     return [a:cmd, {}]
-  elseif has('patch-8.2.0239') || has('nvim-0.5.1') || has('patch-8.1.0902') && !has('nvim') && (!has('win32') || empty(filter(keys(a:env), 'exists("$" . v:val)')))
+  elseif has('patch-8.2.0239') ||
+        \ has('nvim') && api_info().version.api_level - api_info().version.api_prerelease >= 7 ||
+        \ has('patch-8.0.0902') && !has('nvim') && (!has('win32') || empty(filter(keys(a:env), 'exists("$" . v:val)')))
     return [a:cmd, {'env': a:env}]
   endif
   let envlist = map(items(a:env), 'join(v:val, "=")')
@@ -502,6 +684,70 @@ function! s:JobOpts(cmd, env) abort
   endif
 endfunction
 
+function! s:PrepareJob(opts) abort
+  let dict = {'argv': a:opts.argv}
+  if has_key(a:opts, 'env')
+    let dict.env = a:opts.env
+  endif
+  let [argv, jopts] = s:JobOpts(a:opts.argv, get(a:opts, 'env', {}))
+  if has_key(a:opts, 'cwd')
+    if has('patch-8.0.0902')
+      let jopts.cwd = a:opts.cwd
+      let dict.cwd = a:opts.cwd
+    else
+      throw 'fugitive: cwd unsupported'
+    endif
+  endif
+  return [argv, jopts, dict]
+endfunction
+
+function! fugitive#PrepareJob(...) abort
+  if a:0 == 1 && type(a:1) == type({}) && has_key(a:1, 'argv') && !has_key(a:1, 'args')
+    return s:PrepareJob(a:1)
+  endif
+  let [dir, user_env, exec_env, git, flags, args] = call('fugitive#PrepareDirEnvGitFlagsArgs', a:000)
+  let dict = {'git': git, 'git_dir': dir, 'flags': flags, 'args': args}
+  if len(user_env)
+    let dict.env = user_env
+  endif
+  let cmd = flags + args
+  let tree = s:Tree(dir)
+  if empty(tree) || index(cmd, '--') == len(cmd) - 1
+    let dict.cwd = getcwd()
+    call extend(cmd, ['--git-dir=' . FugitiveGitPath(dir)], 'keep')
+  else
+    let dict.cwd = FugitiveVimPath(tree)
+    call extend(cmd, ['-C', FugitiveGitPath(tree)], 'keep')
+    if !s:cpath(tree . '/.git', dir) || len($GIT_DIR)
+      call extend(cmd, ['--git-dir=' . FugitiveGitPath(dir)], 'keep')
+    endif
+  endif
+  call extend(cmd, git, 'keep')
+  return s:JobOpts(cmd, exec_env) + [dict]
+endfunction
+
+function! fugitive#Execute(...) abort
+  let cb = copy(a:000)
+  let cmd = []
+  let stdin = []
+  while len(cb) && type(cb[0]) !=# type(function('tr'))
+    if type(cb[0]) ==# type({}) && has_key(cb[0], 'stdin')
+      if type(cb[0].stdin) == type([])
+        call extend(stdin, cb[0].stdin)
+      elseif type(cb[0].stdin) == type('')
+        call extend(stdin, readfile(cb[0].stdin, 'b'))
+      endif
+      if len(keys(cb[0])) == 1
+        call remove(cb, 0)
+        continue
+      endif
+    endif
+    call add(cmd, remove(cb, 0))
+  endwhile
+  let [argv, jopts, dict] = call('fugitive#PrepareJob', cmd)
+  return s:JobExecute(argv, jopts, stdin, cb, dict)
+endfunction
+
 function! s:BuildShell(dir, env, git, args) abort
   let cmd = copy(a:args)
   let tree = s:Tree(a:dir)
@@ -510,16 +756,67 @@ function! s:BuildShell(dir, env, git, args) abort
     call insert(cmd, '--git-dir=' . FugitiveGitPath(a:dir))
   else
     call extend(cmd, ['-C', FugitiveGitPath(tree)], 'keep')
+    if !s:cpath(tree . '/.git', a:dir) || len($GIT_DIR)
+      call extend(cmd, ['--git-dir=' . FugitiveGitPath(a:dir)], 'keep')
+    endif
   endif
   return pre . join(map(a:git + cmd, 's:shellesc(v:val)'))
 endfunction
 
+function! s:JobNvimCallback(lines, job, data, type) abort
+  let a:lines[-1] .= remove(a:data, 0)
+  call extend(a:lines, a:data)
+endfunction
+
+function! s:SystemList(cmd) abort
+  let exit = []
+  if exists('*jobstart')
+    let lines = ['']
+    let jopts = {
+          \ 'on_stdout': function('s:JobNvimCallback', [lines]),
+          \ 'on_stderr': function('s:JobNvimCallback', [lines]),
+          \ 'on_exit': { j, code, _ -> add(exit, code) }}
+    let job = jobstart(a:cmd, jopts)
+    call chanclose(job, 'stdin')
+    call jobwait([job])
+    if empty(lines[-1])
+      call remove(lines, -1)
+    endif
+    return [lines, exit[0]]
+  elseif exists('*job_start')
+    let lines = []
+    let jopts = {
+          \ 'out_cb': { j, str -> add(lines, str) },
+          \ 'err_cb': { j, str -> add(lines, str) },
+          \ 'exit_cb': { j, code -> add(exit, code) }}
+    let job = job_start(a:cmd, jopts)
+    call ch_close_in(job)
+    let sleep = has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m'
+    while ch_status(job) !=# 'closed' || job_status(job) ==# 'run'
+      exe sleep
+    endwhile
+    return [lines, exit[0]]
+  else
+    let [output, exec_error] = s:SystemError(s:shellesc(a:cmd))
+    let lines = split(output, "\n", 1)
+    if empty(lines[-1])
+      call remove(lines, -1)
+    endif
+    return [lines, v:shell_error]
+  endif
+endfunction
+
+function! fugitive#ShellCommand(...) abort
+  let [dir, _, env, git, flags, args] = call('fugitive#PrepareDirEnvGitFlagsArgs', a:000)
+  return s:BuildShell(dir, env, git, flags + args)
+endfunction
+
 function! fugitive#Prepare(...) abort
-  let [dir, env, git, argv] = call('fugitive#PrepareDirEnvGitArgv', a:000)
-  return s:BuildShell(dir, env, git, argv)
+  return call('fugitive#ShellCommand', a:000)
 endfunction
 
 function! s:SystemError(cmd, ...) abort
+  let cmd = type(a:cmd) == type([]) ? s:shellesc(a:cmd) : a:cmd
   try
     if &shellredir ==# '>' && &shell =~# 'sh\|cmd'
       let shellredir = &shellredir
@@ -533,13 +830,13 @@ function! s:SystemError(cmd, ...) abort
       let guioptions = &guioptions
       set guioptions-=!
     endif
-    let out = call('system', [type(a:cmd) == type([]) ? s:shellesc(a:cmd) : a:cmd] + a:000)
+    let out = call('system', [cmd] + a:000)
     return [out, v:shell_error]
   catch /^Vim\%((\a\+)\)\=:E484:/
     let opts = ['shell', 'shellcmdflag', 'shellredir', 'shellquote', 'shellxquote', 'shellxescape', 'shellslash']
     call filter(opts, 'exists("+".v:val) && !empty(eval("&".v:val))')
     call map(opts, 'v:val."=".eval("&".v:val)')
-    call s:throw('failed to run `' . a:cmd . '` with ' . join(opts, ' '))
+    call s:throw('failed to run `' . cmd . '` with ' . join(opts, ' '))
   finally
     if exists('shellredir')
       let &shellredir = shellredir
@@ -550,49 +847,82 @@ function! s:SystemError(cmd, ...) abort
   endtry
 endfunction
 
-function! s:ChompError(...) abort
-  let [out, exec_error] = s:SystemError(call('fugitive#Prepare', a:000))
-  return [s:sub(out, '\n$', ''), exec_error]
+function! s:ChompStderr(...) abort
+  let r = call('fugitive#Execute', a:000)
+  return !r.exit_status ? '' : len(r.stderr) > 1 ? s:JoinChomp(r.stderr) : 'unknown Git error' . string(r)
 endfunction
 
 function! s:ChompDefault(default, ...) abort
-  let [out, exec_error] = call('s:ChompError', a:000)
-  return exec_error ? a:default : out
+  let r = call('fugitive#Execute', a:000)
+  return r.exit_status ? a:default : s:JoinChomp(r.stdout)
 endfunction
 
 function! s:LinesError(...) abort
-  let [out, exec_error] = call('s:ChompError', a:000)
-  return [len(out) && !exec_error ? split(out, "\n", 1) : [], exec_error]
+  let r = call('fugitive#Execute', a:000)
+  if empty(r.stdout[-1])
+    call remove(r.stdout, -1)
+  endif
+  return [r.exit_status ? [] : r.stdout, r.exit_status]
 endfunction
 
-function! s:NullError(...) abort
-  let [out, exec_error] = s:SystemError(call('fugitive#Prepare', a:000))
-  if exec_error
-    return [[], substitute(out, "\n$", "", ""), exec_error]
-  else
-    let list = split(out, "\1", 1)
-    call remove(list, -1)
-    return [list, '', exec_error]
-  endif
+function! s:NullError(cmd) abort
+  let r = fugitive#Execute(a:cmd)
+  let list = r.exit_status ? [] : split(tr(join(r.stdout, "\1"), "\1\n", "\n\1"), "\1", 1)[0:-2]
+  return [list, s:JoinChomp(r.stderr), r.exit_status]
 endfunction
 
 function! s:TreeChomp(...) abort
-  let cmd = call('fugitive#Prepare', a:000)
-  let [out, exec_error] = s:SystemError(cmd)
-  let out = s:sub(out, '\n$', '')
-  if !exec_error
-    return out
+  let r = call('fugitive#Execute', a:000)
+  if !r.exit_status
+    return s:JoinChomp(r.stdout)
   endif
-  throw 'fugitive: error running `' . cmd . '`: ' . out
+  throw 'fugitive: error running `' . call('fugitive#ShellCommand', a:000) . '`: ' . s:JoinChomp(r.stderr)
 endfunction
 
-function! s:EchoExec(...) abort
-  if s:RunJobs()
-    return 'Git ' . s:fnameescape(a:000)
+function! s:StdoutToFile(out, cmd, ...) abort
+  let [argv, jopts, _] = fugitive#PrepareJob(a:cmd)
+  let exit = []
+  if exists('*jobstart')
+    call extend(jopts, {
+          \ 'stdout_buffered': v:true,
+          \ 'stderr_buffered': v:true,
+          \ 'on_exit': { j, code, _ -> add(exit, code) }})
+    let job = jobstart(argv, jopts)
+    if a:0
+      call chansend(job, a:1)
+    endif
+    call chanclose(job, 'stdin')
+    call jobwait([job])
+    if len(a:out)
+      call writefile(jopts.stdout, a:out, 'b')
+    endif
+    return [join(jopts.stderr, "\n"), exit[0]]
+  elseif exists('*job_start')
+    try
+      let err = tempname()
+      call extend(jopts, {
+            \ 'out_io': len(a:out) ? 'file' : 'null',
+            \ 'out_name': a:out,
+            \ 'err_io': 'file',
+            \ 'err_name': err,
+            \ 'exit_cb': { j, code -> add(exit, code) }})
+      let job = job_start(argv, jopts)
+      if a:0
+        call ch_sendraw(job, a:1)
+      endif
+      call ch_close_in(job)
+      while ch_status(job) !=# 'closed' || job_status(job) ==# 'run'
+        exe has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m'
+      endwhile
+      return [join(readfile(err, 'b'), "\n"), exit[0]]
+    finally
+      call delete(err)
+    endtry
+  elseif s:winshell() || &shell !~# 'sh' || &shell =~# 'fish\|\%(powershell\|pwsh\)\%(\.exe\)\=$'
+    throw 'fugitive: Vim 8 or higher required to use ' . &shell
   else
-    echo call('s:ChompError', a:000)[0]
-    call fugitive#ReloadStatus(-1, 1)
-    return 'checktime'
+    let cmd = fugitive#ShellCommand(a:cmd)
+    return s:SystemError(' (' . cmd . ' >' . a:out . ') ')
   endif
 endfunction
 
@@ -607,28 +937,34 @@ function! fugitive#Head(...) abort
   let ftime = getftime(file)
   if ftime == -1
     return ''
-  elseif ftime != get(s:head_cache, dir, [-1])[0]
-    let s:head_cache[dir] = [ftime, readfile(file)[0]]
+  elseif ftime != get(s:head_cache, file, [-1])[0]
+    let s:head_cache[file] = [ftime, readfile(file)[0]]
   endif
-  let head = s:head_cache[dir][1]
+  let head = s:head_cache[file][1]
+  let len = a:0 ? a:1 : 0
   if head =~# '^ref: '
-    return substitute(head, '\C^ref: \%(refs/\%(heads/\|remotes/\|tags/\)\=\)\=', '', '')
+    if len < 0
+      return strpart(head, 5)
+    else
+      return substitute(head, '\C^ref: \%(refs/\%(heads/\|remotes/\|tags/\)\=\)\=', '', '')
+    endif
   elseif head =~# '^\x\{40,\}$'
-    let len = a:0 ? a:1 : 0
-    return len < 0 ? head : len ? head[0:len-1] : ''
+    return len < 0 ? head : strpart(head, 0, len)
   else
     return ''
   endif
 endfunction
 
 function! fugitive#RevParse(rev, ...) abort
-  let [hash, exec_error] = s:ChompError([a:0 ? a:1 : s:Dir(), 'rev-parse', '--verify', a:rev, '--'])
-  if !exec_error && hash =~# '^\x\{40,\}$'
+  let hash = s:ChompDefault('', [a:0 ? a:1 : s:Dir(), 'rev-parse', '--verify', a:rev, '--'])
+  if hash =~# '^\x\{40,\}$'
     return hash
   endif
-  throw 'fugitive: rev-parse '.a:rev.': '.hash
+  throw 'fugitive: failed to parse revision ' . a:rev
 endfunction
 
+" Section: Git config
+
 function! s:ConfigTimestamps(dir, dict) abort
   let files = ['/etc/gitconfig', '~/.gitconfig',
         \ len($XDG_CONFIG_HOME) ? $XDG_CONFIG_HOME . '/git/config' : '~/.config/git/config']
@@ -639,18 +975,69 @@ function! s:ConfigTimestamps(dir, dict) abort
   return join(map(files, 'getftime(expand(v:val))'), ',')
 endfunction
 
+function! s:ConfigCallback(r, into) abort
+  let dict = a:into[1]
+  if has_key(dict, 'job')
+    call remove(dict, 'job')
+  endif
+  let lines = a:r.exit_status ? [] : split(tr(join(a:r.stdout, "\1"), "\1\n", "\n\1"), "\1", 1)[0:-2]
+  for line in lines
+    let key = matchstr(line, "^[^\n]*")
+    if !has_key(dict, key)
+      let dict[key] = []
+    endif
+    if len(key) ==# len(line)
+      call add(dict[key], 1)
+    else
+      call add(dict[key], strpart(line, len(key) + 1))
+    endif
+  endfor
+  let callbacks = remove(dict, 'callbacks')
+  lockvar! dict
+  let a:into[0] = s:ConfigTimestamps(dict.git_dir, dict)
+  for callback in callbacks
+    call call(callback[0], [dict] + callback[1:-1])
+  endfor
+endfunction
+
 let s:config_prototype = {}
 
 let s:config = {}
+function! fugitive#ExpireConfig(...) abort
+  if !a:0 || a:1 is# 0
+    let s:config = {}
+  else
+    let key = a:1 is# '' ? '_' : s:GitDir(a:0 ? a:1 : -1)
+    if len(key) && has_key(s:config, key)
+      call remove(s:config, key)
+    endif
+  endif
+endfunction
+
 function! fugitive#Config(...) abort
   let name = ''
   let default = get(a:, 3, '')
-  if a:0 >= 2 && type(a:2) == type({}) && has_key(a:2, 'GetAll')
-    return fugitive#ConfigGetAll(a:1, a:2)
+  if a:0 && type(a:1) == type(function('tr'))
+    let dir = s:Dir()
+    let callback = a:000
+  elseif a:0 > 1 && type(a:2) == type(function('tr'))
+    if type(a:1) == type({}) && has_key(a:1, 'GetAll')
+      if has_key(a:1, 'callbacks')
+        call add(a:1.callbacks, a:000[1:-1])
+      else
+        call call(a:2, [a:1] + a:000[2:-1])
+      endif
+      return a:1
+    else
+      let dir = s:Dir(a:1)
+      let callback = a:000[1:-1]
+    endif
+  elseif a:0 >= 2 && type(a:2) == type({}) && has_key(a:2, 'GetAll')
+    return get(fugitive#ConfigGetAll(a:1, a:2), 0, default)
   elseif a:0 >= 2
     let dir = s:Dir(a:2)
     let name = a:1
-  elseif a:0 == 1 && type(a:1) == type({}) && !has_key(a:1, 'git_dir')
+  elseif a:0 == 1 && type(a:1) == type({}) && has_key(a:1, 'GetAll')
     return a:1
   elseif a:0 == 1 && type(a:1) == type('') && a:1 =~# '^[[:alnum:]-]\+\.'
     let dir = s:Dir()
@@ -661,48 +1048,59 @@ function! fugitive#Config(...) abort
     let dir = s:Dir()
   endif
   let name = substitute(name, '^[^.]\+\|[^.]\+$', '\L&', 'g')
-  let dir_key = len(dir) ? dir : '_'
-  if has_key(s:config, dir_key) && s:config[dir_key][0] ==# s:ConfigTimestamps(dir, s:config[dir_key][1])
-    let dict = s:config[dir_key][1]
-  else
+  let git_dir = s:GitDir(dir)
+  let dir_key = len(git_dir) ? git_dir : '_'
+  let [ts, dict] = get(s:config, dir_key, ['new', {}])
+  if !has_key(dict, 'job') && ts !=# s:ConfigTimestamps(git_dir, dict)
     let dict = copy(s:config_prototype)
-    let dict.git_dir = dir
-    let [lines, message, exec_error] = s:NullError([dir, 'config', '--list', '-z'])
-    if exec_error
-      return {}
+    let dict.git_dir = git_dir
+    let into = ['running', dict]
+    let dict.callbacks = []
+    let exec = fugitive#Execute([dir, 'config', '--list', '-z', '--'], function('s:ConfigCallback'), into)
+    if has_key(exec, 'job')
+      let dict.job = exec.job
     endif
-    for line in lines
-      let key = matchstr(line, "^[^\n]*")
-      if !has_key(dict, key)
-        let dict[key] = []
-      endif
-      if len(key) ==# len(line)
-        call add(dict[key], 1)
-      else
-        call add(dict[key], strpart(line, len(key) + 1))
-      endif
-    endfor
-    let s:config[dir_key] = [s:ConfigTimestamps(dir, dict), dict]
-    lockvar! dict
+    let s:config[dir_key] = into
   endif
-  return len(name) ? get(get(dict, name, []), 0, default) : dict
+  if !exists('l:callback')
+    call fugitive#Wait(dict)
+  elseif has_key(dict, 'callbacks')
+    call add(dict.callbacks, callback)
+  else
+    call call(callback[0], [dict] + callback[1:-1])
+  endif
+  return len(name) ? get(fugitive#ConfigGetAll(name, dict), 0, default) : dict
 endfunction
 
 function! fugitive#ConfigGetAll(name, ...) abort
-  let config = fugitive#Config(a:0 ? a:1 : s:Dir())
-  let name = substitute(a:name, '^[^.]\+\|[^.]\+$', '\L&', 'g')
-  return copy(get(config, name, []))
+  if a:0 && (type(a:name) !=# type('') || a:name !~# '^[[:alnum:]-]\+\.' && type(a:1) ==# type('') && a:1 =~# '^[[:alnum:]-]\+\.')
+    let config = fugitive#Config(a:name)
+    let name = a:1
+  else
+    let config = fugitive#Config(a:0 ? a:1 : s:Dir())
+    let name = a:name
+  endif
+  let name = substitute(name, '^[^.]\+\|[^.]\+$', '\L&', 'g')
+  call fugitive#Wait(config)
+  return name =~# '\.' ? copy(get(config, name, [])) : []
 endfunction
 
 function! fugitive#ConfigGetRegexp(pattern, ...) abort
-  let config = fugitive#Config(a:0 ? a:1 : s:Dir())
-  let filtered = map(filter(copy(config), 'v:key =~# "\\." && v:key =~# a:pattern'), 'copy(v:val)')
-  if a:pattern !~# '\\\@<!\%(\\\\\)*\\z[se]'
+  if type(a:pattern) !=# type('')
+    let config = fugitive#Config(a:name)
+    let pattern = a:0 ? a:1 : '.*'
+  else
+    let config = fugitive#Config(a:0 ? a:1 : s:Dir())
+    let pattern = a:pattern
+  endif
+  call fugitive#Wait(config)
+  let filtered = map(filter(copy(config), 'v:key =~# "\\." && v:key =~# pattern'), 'copy(v:val)')
+  if pattern !~# '\\\@<!\%(\\\\\)*\\z[se]'
     return filtered
   endif
   let transformed = {}
   for [k, v] in items(filtered)
-    let k = matchstr(k, a:pattern)
+    let k = matchstr(k, pattern)
     if len(k)
       let transformed[k] = v
     endif
@@ -712,11 +1110,8 @@ endfunction
 
 function! s:config_GetAll(name) dict abort
   let name = substitute(a:name, '^[^.]\+\|[^.]\+$', '\L&', 'g')
-  if name =~# '\.'
-    return get(self, name, [])
-  else
-    return []
-  endif
+  call fugitive#Wait(self)
+  return name =~# '\.' ? copy(get(self, name, [])) : []
 endfunction
 
 function! s:config_Get(name, ...) dict abort
@@ -729,7 +1124,7 @@ endfunction
 
 call s:add_methods('config', ['GetAll', 'Get', 'GetRegexp'])
 
-function! s:Remote(dir) abort
+function! s:RemoteDefault(dir) abort
   let head = FugitiveHead(0, a:dir)
   let remote = len(head) ? FugitiveConfigGet('branch.' . head . '.remote', a:dir) : ''
   let i = 10
@@ -820,35 +1215,87 @@ function! fugitive#SshHostAlias(authority) abort
   return (len(user) ? user . '@' : '') . get(c, 'hostname', host) . (port =~# '^\%(22\)\=$' ? '' : ':' . port)
 endfunction
 
-let s:redirects = {}
+function! s:CurlResponse(result) abort
+  let a:result.headers = {}
+  for line in a:result.exit_status ? [] : remove(a:result, 'stdout')
+    let header = matchlist(line, '^\([[:alnum:]-]\+\):\s\(.\{-\}\)'. "\r\\=$")
+    if len(header)
+      let k = tolower(header[1])
+      if has_key(a:result.headers, k)
+        let a:result.headers[k] .= ', ' . header[2]
+      else
+        let a:result.headers[k] = header[2]
+      endif
+    elseif empty(line)
+      break
+    endif
+  endfor
+endfunction
 
-function! fugitive#ResolveRemote(remote) abort
-  if a:remote =~# '^https\=://' && s:executable('curl')
-    if !has_key(s:redirects, a:remote)
-      let s:redirects[a:remote] = matchstr(s:SystemError(
-            \ ['curl', '--disable', '--silent', '--max-time', '5', '-I',
-            \ a:remote . '/info/refs?service=git-upload-pack'])[0],
-            \ 'Location: \zs\S\+\ze/info/refs?')
-    endif
-    if len(s:redirects[a:remote])
-      return s:redirects[a:remote]
-    endif
-  elseif a:remote =~# '^ssh://'
-    let authority = matchstr(a:remote, '[^/?#]*', 6)
-    return 'ssh://' . fugitive#SshHostAlias(authority) . strpart(a:remote, 6 + len(authority))
+let s:remote_headers = {}
+
+function! fugitive#RemoteHttpHeaders(remote) abort
+  let remote = type(a:remote) ==# type({}) ? get(a:remote, 'remote', '') : a:remote
+  if type(remote) !=# type('') || remote !~# '^https\=://.' || !s:executable('curl')
+    return {}
   endif
-  let scp_authority = matchstr(a:remote, '^[^:/]\+\ze:\%(//\)\@!')
-  if empty(scp_authority)
-    return a:remote
+  if !has_key(s:remote_headers, remote)
+    let url = remote . '/info/refs?service=git-upload-pack'
+    let exec = s:JobExecute(
+          \ ['curl', '--disable', '--silent', '--max-time', '5', '-X', 'GET', '-I',
+          \ url], {}, [], [function('s:CurlResponse')], {})
+    call fugitive#Wait(exec)
+    let s:remote_headers[remote] = exec.headers
   endif
-  let path = strpart(a:remote, len(scp_authority) + 1)
-  let alias = fugitive#SshHostAlias(scp_authority)
-  if alias !~# ':'
-    return alias . ':' . path
-  elseif path =~# '^/'
-    return 'ssh://' . alias . path
+  return s:remote_headers[remote]
+endfunction
+
+function! s:UrlParse(url) abort
+  let scp_authority = matchstr(a:url, '^[^:/]\+\ze:\%(//\)\@!')
+  if len(scp_authority) && !(has('win32') && scp_authority =~# '^\a:[\/]')
+    return {'scheme': 'ssh', 'authority': scp_authority,
+          \ 'path': strpart(a:url, len(scp_authority) + 1)}
+  endif
+  let match = matchlist(a:url, '^\([[:alnum:].+-]\+\)://\([^/]*\)\(/.*\)\=\%(#\|$\)')
+  if empty(match)
+    return {'scheme': 'file', 'authority': '', 'path': a:url}
+  endif
+  let remote = {'scheme': match[1], 'authority': match[2]}
+  let remote.path = empty(match[3]) ? '/' : match[3]
+  if (remote.scheme ==# 'ssh' || remote.scheme ==# 'git') && remote.path[0:1] ==# '/~'
+    let remote.path = strpart(remote.path, 1)
+  endif
+  return remote
+endfunction
+
+function! s:ResolveRemote(url) abort
+  let remote = s:UrlParse(a:url)
+  if remote.scheme =~# '^https\=$'
+    let headers = fugitive#RemoteHttpHeaders(remote.scheme . '://' . remote.authority . remote.path)
+    let loc = matchstr(get(headers, 'location', ''), '^https\=://.\{-\}\ze/info/refs?')
+    if len(loc)
+      let remote = s:UrlParse(loc)
+    else
+      let remote.http_headers = headers
+    endif
+  elseif remote.scheme ==# 'ssh'
+    let remote.authority = fugitive#SshHostAlias(remote.authority)
+  endif
+  return remote
+endfunction
+
+function! fugitive#ResolveRemote(url) abort
+  let remote = s:ResolveRemote(a:url)
+  if remote.scheme ==# 'file' || remote.scheme ==# ''
+    return remote.path
+  elseif remote.path =~# '^/'
+    return remote.scheme . '://' . remote.authority . remote.path
+  elseif remote.path =~# '^\~'
+    return remote.scheme . '://' . remote.authority . '/' . remote.path
+  elseif remote.scheme ==# 'ssh' && remote.authority !~# ':'
+    return remote.authority . ':' . remote.path
   else
-    return a:remote
+    return a:url
   endif
 endfunction
 
@@ -856,27 +1303,68 @@ function! s:ConfigLengthSort(i1, i2) abort
   return len(a:i2[0]) - len(a:i1[0])
 endfunction
 
-function! fugitive#RemoteUrl(...) abort
-  let dir = a:0 > 1 ? s:Dir(a:2) : s:Dir()
-  let url = !a:0 || a:1 =~# '^\.\=$' ? s:Remote(dir) : a:1
-  if url !~# ':\|^/\|^\.\.\=/'
-    let config = fugitive#Config(a:0 > 1 ? a:2 : s:Dir())
-    let url = FugitiveConfigGet('remote.' . url . '.url', config)
-    let instead_of = []
-    for [k, vs] in items(fugitive#ConfigGetRegexp('^url\.\zs.\{-\}\ze\.insteadof$', config))
-      for v in vs
-        call add(instead_of, [v, k])
-      endfor
-    endfor
-    call sort(instead_of, 's:ConfigLengthSort')
-    for [orig, replacement] in instead_of
-      if strpart(url, 0, len(orig)) ==# orig
-        let url = replacement . strpart(url, len(orig))
-        break
-      endif
-    endfor
+function! s:RemoteParseArgs(args) abort
+  " Extract ':noresolve' style flags and an optional callback
+  let args = []
+  let flags = []
+  let cb = copy(a:args)
+  while len(cb)
+    if type(cb[0]) ==# type(function('tr'))
+      break
+    elseif len(args) > 1 || type(cb[0]) ==# type('') && cb[0] =~# '^:'
+      call add(flags, remove(cb, 0))
+    else
+      call add(args, remove(cb, 0))
+    endif
+  endwhile
+
+  " From the remaining 0-2 arguments, extract the remote and Git config
+  let remote = ''
+  if empty(args)
+    let dir_or_config = s:Dir()
+  elseif len(args) == 1 && type(args[0]) ==# type('') && args[0] !~# '^/\|^\a:[\\/]'
+    let dir_or_config = s:Dir()
+    let remote = args[0]
+  elseif len(args) == 1
+    let dir_or_config = args[0]
+    if type(args[0]) ==# type({}) && has_key(args[0], 'remote_name')
+      let remote = args[0].remote_name
+    endif
+  elseif type(args[1]) !=# type('') || args[1] =~# '^/\|^\a:[\\/]'
+    let dir_or_config = args[1]
+    let remote = args[0]
+  else
+    let dir_or_config = args[0]
+    let remote = args[1]
   endif
-  if !get(a:, 3, 0)
+  return [dir_or_config, remote, flags, cb]
+endfunction
+
+function! fugitive#RemoteUrl(...) abort
+  let [dir_or_config, url, flags, cb] = s:RemoteParseArgs(a:000)
+  let config = fugitive#Config(dir_or_config)
+  if url =~# '^\.\=$'
+    let url = s:RemoteDefault(config)
+  endif
+  if url ==# '.git'
+    let url = s:GitDir(config)
+  elseif url !~# ':\|^/\|^\.\.\=/'
+    let url = FugitiveConfigGet('remote.' . url . '.url', config)
+  endif
+  let instead_of = []
+  for [k, vs] in items(fugitive#ConfigGetRegexp('^url\.\zs.\{-\}\ze\.insteadof$', config))
+    for v in vs
+      call add(instead_of, [v, k])
+    endfor
+  endfor
+  call sort(instead_of, 's:ConfigLengthSort')
+  for [orig, replacement] in instead_of
+    if strpart(url, 0, len(orig)) ==# orig
+      let url = replacement . strpart(url, len(orig))
+      break
+    endif
+  endfor
+  if index(flags, 1) < 0 && index(flags, get(v:, 'true', 1)) < 0 && index(flags, ':noresolve') < 0
     let url = fugitive#ResolveRemote(url)
   endif
   return url
@@ -908,21 +1396,25 @@ function! s:QuickfixCreate(nr, opts) abort
   endif
 endfunction
 
+function! s:QuickfixOpen(nr, mods) abort
+  let mods = substitute(s:Mods(a:mods), '\<tab\>', '', '')
+  return mods . (a:nr < 0 ? 'c' : 'l').'open' . (mods =~# '\<vertical\>' ? ' 20' : '')
+endfunction
+
 function! s:QuickfixStream(nr, event, title, cmd, first, mods, callback, ...) abort
   call s:BlurStatus()
-  let mods = s:Mods(a:mods)
   let opts = {'title': a:title, 'context': {'items': []}}
   call s:QuickfixCreate(a:nr, opts)
   let event = (a:nr < 0 ? 'c' : 'l') . 'fugitive-' . a:event
   silent exe s:DoAutocmd('QuickFixCmdPre ' . event)
   let winnr = winnr()
-  exe a:nr < 0 ? 'copen' : 'lopen'
+  exe s:QuickfixOpen(a:nr, a:mods)
   if winnr != winnr()
     wincmd p
   endif
 
   let buffer = []
-  let lines = split(s:SystemError(a:cmd)[0], "\n")
+  let lines = s:SystemList(a:cmd)[0]
   for line in lines
     call extend(buffer, call(a:callback, a:000 + [line]))
     if len(buffer) >= 20
@@ -931,7 +1423,7 @@ function! s:QuickfixStream(nr, event, title, cmd, first, mods, callback, ...) ab
       call extend(opts.context.items, contexts)
       unlet contexts
       call s:QuickfixSet(a:nr, remove(buffer, 0, -1), 'a')
-      if mods !~# '\<silent\>'
+      if a:mods !~# '\<silent\>'
         redraw
       endif
     endif
@@ -943,7 +1435,7 @@ function! s:QuickfixStream(nr, event, title, cmd, first, mods, callback, ...) ab
 
   silent exe s:DoAutocmd('QuickFixCmdPost ' . event)
   if a:first && len(s:QuickfixGet(a:nr))
-    return mods . (a:nr < 0 ? 'cfirst' : 'lfirst')
+    return (a:nr < 0 ? 'cfirst' : 'lfirst')
   else
     return 'exe'
   endif
@@ -966,7 +1458,7 @@ let s:repo_prototype = {}
 let s:repos = {}
 
 function! fugitive#repo(...) abort
-  let dir = a:0 ? s:Dir(a:1) : (len(s:Dir()) ? s:Dir() : FugitiveExtractGitDir(expand('%:p')))
+  let dir = a:0 ? s:GitDir(a:1) : (len(s:GitDir()) ? s:GitDir() : FugitiveExtractGitDir(expand('%:p')))
   if dir !=# ''
     if has_key(s:repos, dir)
       let repo = get(s:repos, dir)
@@ -1014,17 +1506,12 @@ endfunction
 
 call s:add_methods('repo',['dir','tree','bare','find','translate','head'])
 
-function! s:repo_prepare(...) dict abort
-  return call('fugitive#Prepare', [self.git_dir] + a:000)
-endfunction
-
 function! s:repo_git_command(...) dict abort
-  let git = s:GitShellCmd() . ' --git-dir='.s:shellesc(self.git_dir)
-  return git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'')
+  throw 'fugitive: fugitive#repo().git_command(...) has been replaced by FugitiveShellCommand(...)'
 endfunction
 
 function! s:repo_git_chomp(...) dict abort
-  return s:sub(system(FugitivePrepare(a:000, self.git_dir)), '\n$', '')
+  return s:sub(system(fugitive#ShellCommand(a:000, self.git_dir)), '\n$', '')
 endfunction
 
 function! s:repo_git_chomp_in_tree(...) dict abort
@@ -1035,7 +1522,7 @@ function! s:repo_rev_parse(rev) dict abort
   return fugitive#RevParse(a:rev, self.git_dir)
 endfunction
 
-call s:add_methods('repo',['prepare','git_command','git_chomp','git_chomp_in_tree','rev_parse'])
+call s:add_methods('repo',['git_command','git_chomp','git_chomp_in_tree','rev_parse'])
 
 function! s:repo_superglob(base) dict abort
   return map(fugitive#CompleteObject(a:base, self.git_dir), 'substitute(v:val, ''\\\(.\)'', ''\1'', "g")')
@@ -1062,7 +1549,7 @@ function! s:DirCommitFile(path) abort
   if empty(vals)
     return ['', '', '']
   endif
-  return vals[1:3]
+  return [s:Dir(vals[1])] + vals[2:3]
 endfunction
 
 function! s:DirRev(url) abort
@@ -1071,8 +1558,8 @@ function! s:DirRev(url) abort
 endfunction
 
 let s:merge_heads = ['MERGE_HEAD', 'REBASE_HEAD', 'CHERRY_PICK_HEAD', 'REVERT_HEAD']
-function! s:MergeHead(...) abort
-  let dir = fugitive#Find('.git/', a:0 ? a:1 : s:Dir())
+function! s:MergeHead(dir) abort
+  let dir = fugitive#Find('.git/', a:dir)
   for head in s:merge_heads
     if filereadable(dir . head)
       return head
@@ -1082,7 +1569,7 @@ function! s:MergeHead(...) abort
 endfunction
 
 function! s:Owner(path, ...) abort
-  let dir = a:0 ? a:1 : s:Dir()
+  let dir = a:0 ? s:Dir(a:1) : s:Dir()
   if empty(dir)
     return ''
   endif
@@ -1139,7 +1626,7 @@ function! fugitive#Path(url, ...) abort
   if empty(a:url)
     return ''
   endif
-  let dir = a:0 > 1 ? a:2 : s:Dir()
+  let dir = a:0 > 1 ? s:Dir(a:2) : s:Dir()
   let tree = s:Tree(dir)
   if !a:0
     return fugitive#Real(a:url)
@@ -1203,7 +1690,7 @@ function! fugitive#Find(object, ...) abort
   elseif rev =~# '^\.\.\=\%(/\|$\)'
     return FugitiveVimPath(simplify(getcwd() . '/' . a:object))
   endif
-  let dir = a:0 ? a:1 : s:Dir()
+  let dir = call('s:GitDir', a:000)
   if empty(dir)
     let file = matchstr(a:object, '^\%(:\d:\|[^:]*:\)\zs\%(\.\.\=$\|\.\.\=/.*\|/.*\|\w:/.*\)')
     let dir = FugitiveExtractGitDir(file)
@@ -1212,9 +1699,10 @@ function! fugitive#Find(object, ...) abort
     endif
   endif
   let tree = s:Tree(dir)
-  let base = len(tree) ? tree : 'fugitive://' . dir . '//0'
+  let urlprefix = s:DirUrlPrefix(dir)
+  let base = len(tree) ? tree : urlprefix . '0'
   if rev ==# '.git'
-    let f = len(tree) ? tree . '/.git' : dir
+    let f = len(tree) && len(getftype(tree . '/.git')) ? tree . '/.git' : dir
   elseif rev =~# '^\.git/'
     let f = strpart(rev, 5)
     let fdir = dir . '/'
@@ -1244,7 +1732,7 @@ function! fugitive#Find(object, ...) abort
   elseif rev =~# '^:\%([0-3]:\)\=\.\.\=\%(/\|$\)\|^:[0-3]:\%(/\|\a\+:\)'
     let f = rev =~# '^:\%([0-3]:\)\=\.' ? simplify(getcwd() . '/' . matchstr(rev, '\..*')) : rev[3:-1]
     if s:cpath(base . '/', (f . '/')[0 : len(base)])
-      let f = 'fugitive://' . dir . '//' . +matchstr(rev, '^:\zs\d\ze:') . '/' . strpart(f, len(base) + 1)
+      let f = urlprefix . +matchstr(rev, '^:\zs\d\ze:') . '/' . strpart(f, len(base) + 1)
     else
       let altdir = FugitiveExtractGitDir(f)
       if len(altdir) && !s:cpath(dir, altdir)
@@ -1252,11 +1740,17 @@ function! fugitive#Find(object, ...) abort
       endif
     endif
   elseif rev =~# '^:[0-3]:'
-    let f = 'fugitive://' . dir . '//' . rev[1] . '/' . rev[3:-1]
+    let f = urlprefix . rev[1] . '/' . rev[3:-1]
   elseif rev ==# ':'
-    let f = FugitiveFind('.git/index', dir)
-    if $GIT_INDEX_FILE =~# '/[^/]*index[^/]*\.lock$' && s:cpath(fnamemodify($GIT_INDEX_FILE,':p')[0:strlen(f)-6], s:cpath(f[0 : -6])) && filereadable($GIT_INDEX_FILE)
-      let f = fnamemodify($GIT_INDEX_FILE, ':p')
+    let fdir = dir . '/'
+    let f = fdir . 'index'
+    if len($GIT_INDEX_FILE)
+      let index_dir = substitute($GIT_INDEX_FILE, '[^/]\+$', '', '')
+      if s:cpath(index_dir, fdir)
+        let f = FugitiveVimPath($GIT_INDEX_FILE)
+      elseif s:cpath(resolve(FugitiveVimPath(index_dir)), fdir)
+        let f = resolve(FugitiveVimPath($GIT_INDEX_FILE))
+      endif
     endif
   elseif rev =~# '^:(\%(top\|top,literal\|literal,top\|literal\))'
     let f = matchstr(rev, ')\zs.*')
@@ -1266,7 +1760,7 @@ function! fugitive#Find(object, ...) abort
       let f = base . '/' . f
     endif
   elseif rev =~# '^:/\@!'
-    let f = 'fugitive://' . dir . '//0/' . rev[1:-1]
+    let f = urlprefix . '0/' . rev[1:-1]
   else
     if !exists('f')
       let commit = matchstr(rev, '^\%([^:.-]\|\.\.[^/:]\)[^:]*\|^:.*')
@@ -1295,7 +1789,7 @@ function! fugitive#Find(object, ...) abort
         endif
       endif
       if len(commit)
-        let f = 'fugitive://' . dir . '//' . commit . file
+        let f = urlprefix . commit . file
       else
         let f = base . '/' . substitute(rev, '^:/:\=\|^[^:]\+:', '', '')
       endif
@@ -1310,7 +1804,7 @@ function! s:Generate(object, ...) abort
   if !empty(f)
     return f
   elseif a:object ==# ':/'
-    return len(dir) ? FugitiveVimPath('fugitive://' . dir . '//0') : '.'
+    return len(dir) ? FugitiveVimPath(s:DirUrlPrefix(dir) . '0') : '.'
   endif
   let file = matchstr(a:object, '^\%(:\d:\|[^:]*:\)\zs.*')
   return fnamemodify(FugitiveVimPath(len(file) ? file : a:object), ':p')
@@ -1326,7 +1820,7 @@ function! s:DotRelative(path, ...) abort
 endfunction
 
 function! fugitive#Object(...) abort
-  let dir = a:0 > 1 ? a:2 : s:Dir()
+  let dir = a:0 > 1 ? s:Dir(a:2) : s:Dir()
   let [fdir, rev] = s:DirRev(a:0 ? a:1 : @%)
   if s:cpath(dir) !=# s:cpath(fdir)
     let rev = ''
@@ -1365,7 +1859,7 @@ function! s:BufName(var) abort
 endfunction
 
 function! s:ExpandVarLegacy(str) abort
-  if get(g:, 'fugitive_legacy_quoting', 1)
+  if get(g:, 'fugitive_legacy_quoting', 0)
     return substitute(a:str, '\\\ze[%#!]', '', 'g')
   else
     return a:str
@@ -1384,6 +1878,10 @@ function! s:ExpandVar(other, var, flags, esc, ...) abort
     let buffer = s:BufName(len(a:other) > 1 ? '#'. a:other[1:-1] : '%')
     let owner = s:Owner(buffer)
     return len(owner) ? owner : '@'
+  elseif a:other =~# '^\~[~.]$'
+    return s:Slash(getcwd())
+  elseif len(a:other)
+    return expand(a:other)
   elseif a:var ==# '<cfile>'
     let bufnames = [expand('<cfile>')]
     if v:version >= 704 && get(maparg('<Plug><cfile>', 'c', 0, 1), 'expr')
@@ -1432,25 +1930,31 @@ function! s:ExpandVar(other, var, flags, esc, ...) abort
 endfunction
 
 function! s:Expand(rev, ...) abort
-  if a:rev =~# '^:[0-3]$'
-    let file = len(expand('%')) ? a:rev . ':%' : '%'
-  elseif a:rev ==# '>'
+  if a:rev =~# '^>\=:[0-3]$'
+    let file = len(expand('%')) ? a:rev[-2:-1] . ':%' : '%'
+  elseif a:rev =~# '^>\%(:\=/\)\=$'
     let file = '%'
-  elseif a:rev =~# '^>[~^]'
-    let file = len(expand('%')) ? '!' . a:rev[1:-1] . ':%' : '%'
+  elseif a:rev ==# '>:'
+    let file = empty(s:DirCommitFile(@%)[0]) ? ':0:%' : '%'
   elseif a:rev =~# '^>[> ]\@!'
-    let file = len(expand('%')) ? a:rev[1:-1] . ':%' : '%'
+    let rev = (a:rev =~# '^>[~^]' ? '!' : '') . a:rev[1:-1]
+    let prefix = matchstr(rev, '^\%(\\.\|{[^{}]*}\|[^:]\)*')
+    if prefix !=# rev
+      let file = rev
+    else
+      let file = len(expand('%')) ? rev . ':%' : '%'
+    endif
   else
     let file = a:rev
   endif
   return substitute(file,
-        \ '\(\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\)\|' . s:expand,
+        \ '\(\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\|^\~[~.]\)\|' . s:expand,
         \ '\=tr(s:ExpandVar(submatch(1),submatch(2),submatch(3),"", a:0 ? a:1 : getcwd()), "\1", " ")', 'g')
 endfunction
 
 function! fugitive#Expand(object) abort
   return substitute(a:object,
-        \ '\(\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\)\|' . s:expand,
+        \ '\(\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\|^\~[~.]\)\|' . s:expand,
         \ '\=tr(s:ExpandVar(submatch(1),submatch(2),submatch(3),submatch(5)), "\1", " ")', 'g')
 endfunction
 
@@ -1467,11 +1971,11 @@ function! s:SplitExpandChain(string, ...) abort
     let string = strpart(string, len(arg))
     let arg = substitute(arg, '^\s\+', '', '')
     if !exists('seen_separator')
-      let arg = substitute(arg, '^\%([^:.][^:]*:\|^:\|^:[0-3]:\)\=\zs\.\.\=\%(/.*\)\=$',
+      let arg = substitute(arg, '^\%([^:.][^:]*:\|^:\%((literal)\)\=\|^:[0-3]:\)\=\zs\.\.\=\%(/.*\)\=$',
             \ '\=s:DotRelative(s:Slash(simplify(getcwd() . "/" . submatch(0))), cwd)', '')
     endif
     let arg = substitute(arg,
-          \ '\(' . dquote . '''\%(''''\|[^'']\)*''\|\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\)\|' . s:expand,
+          \ '\(' . dquote . '''\%(''''\|[^'']\)*''\|\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\|^\~[~]\|^\~\w*\|\$\w\+\)\|' . s:expand,
           \ '\=s:ExpandVar(submatch(1),submatch(2),submatch(3),submatch(5), cwd)', 'g')
     call extend(list, split(arg, "\1", 1))
     if arg ==# '--'
@@ -1509,8 +2013,8 @@ function! s:TreeInfo(dir, commit) abort
       let s:trees[a:dir] = {}
     endif
     if !has_key(s:trees[a:dir], a:commit)
-      let [ftime, exec_error] = s:ChompError([a:dir, 'log', '-1', '--pretty=format:%ct', a:commit, '--'])
-      if exec_error
+      let ftime = s:ChompDefault('', [a:dir, 'log', '-1', '--pretty=format:%ct', a:commit, '--'])
+      if empty(ftime)
         let s:trees[a:dir][a:commit] = [{}, -1]
         return s:trees[a:dir][a:commit]
       endif
@@ -1625,7 +2129,7 @@ endfunction
 
 function! s:UpdateIndex(dir, info) abort
   let info = join(a:info[0:-2]) . "\t" . a:info[-1] . "\n"
-  let [error, exec_error] = s:SystemError(fugitive#Prepare([a:dir, 'update-index', '--index-info']), info)
+  let [error, exec_error] = s:StdoutToFile('', [a:dir, 'update-index', '--index-info'], info)
   return !exec_error ? '' : len(error) ? error : 'unknown update-index error'
 endfunction
 
@@ -1641,23 +2145,6 @@ function! fugitive#setfperm(url, perm) abort
   return len(error) ? -1 : 0
 endfunction
 
-function! s:TempCmd(out, cmd) abort
-  try
-    let cmd = (type(a:cmd) == type([]) ? fugitive#Prepare(a:cmd) : a:cmd)
-    let redir = ' > ' . a:out
-    if s:winshell() && !has('nvim')
-      let cmd_escape_char = &shellxquote == '(' ?  '^' : '^^^'
-      return s:SystemError('cmd /c "' . s:gsub(cmd, '[<>%]', cmd_escape_char . '&') . redir . '"')
-    elseif &shell =~? '\%(powershell\|pwsh\)\%(\.exe\)\=$'
-      return s:SystemError(&shell . ' ' . &shellcmdflag . ' ' . s:shellesc(cmd . redir))
-    elseif &shell =~# 'fish'
-      return s:SystemError(' begin;' . cmd . redir . ';end ')
-    else
-      return s:SystemError(' (' . cmd . redir . ') ')
-    endif
-  endtry
-endfunction
-
 if !exists('s:blobdirs')
   let s:blobdirs = {}
 endif
@@ -1673,10 +2160,17 @@ function! s:BlobTemp(url) abort
   let tempparent = fnamemodify(tempfile, ':h')
   if !isdirectory(tempparent)
     call mkdir(tempparent, 'p')
+  elseif isdirectory(tempfile)
+    if commit =~# '^\d$' && has('patch-7.4.1107')
+      call delete(tempfile, 'rf')
+    else
+      return ''
+    endif
   endif
   if commit =~# '^\d$' || !filereadable(tempfile)
     let rev = s:DirRev(a:url)[1]
-    let exec_error = s:TempCmd(tempfile, [dir, 'cat-file', 'blob', rev])[1]
+    let blob_or_filters = fugitive#GitVersion(2, 11) ? '--filters' : 'blob'
+    let exec_error = s:StdoutToFile(tempfile, [dir, 'cat-file', blob_or_filters, rev])[1]
     if exec_error
       call delete(tempfile)
       return ''
@@ -1707,9 +2201,9 @@ function! fugitive#writefile(lines, url, ...) abort
       call writefile(fugitive#readfile(url, 'b'), temp, 'b')
     endif
     call call('writefile', [a:lines, temp] + a:000)
-    let [hash, exec_error] = s:ChompError([dir, 'hash-object', '-w', temp])
-    let mode = len(entry[1]) ? entry[1] : '100644'
-    if !exec_error && hash =~# '^\x\{40,\}$'
+    let hash = s:ChompDefault('', [dir, '--literal-pathspecs', 'hash-object', '-w', FugitiveGitPath(temp)])
+    let mode = entry[1] !=# '000000' ? entry[1] : '100644'
+    if hash =~# '^\x\{40,\}$'
       let error = s:UpdateIndex(dir, [mode, hash, commit, file[1:-1]])
       if empty(error)
         return 0
@@ -1743,7 +2237,7 @@ function! fugitive#glob(url, ...) abort
     endif
     call map(files, 'v:val[0]')
     call filter(files, 'v:val =~# pattern')
-    let prepend = 'fugitive://' . dir . '//' . substitute(commit, '^:', '', '') . '/'
+    let prepend = s:DirUrlPrefix(dir) . substitute(commit, '^:', '', '') . '/'
     call sort(files)
     call map(files, 'FugitiveVimPath(prepend . v:val . append)')
     call extend(results, files)
@@ -1783,7 +2277,7 @@ function! s:buffer_repo() dict abort
 endfunction
 
 function! s:buffer_type(...) dict abort
-  return 'see b:fugitive_type'
+  return 'see per type events at :help fugitive-autocommands'
 endfunction
 
 call s:add_methods('buffer', ['repo', 'type'])
@@ -1794,8 +2288,9 @@ function! s:FilterEscape(items, ...) abort
   let items = copy(a:items)
   call map(items, 's:fnameescape(v:val)')
   if a:0 && type(a:1) == type('')
+    let match = fnameescape(a:1)
     let cmp = s:FileIgnoreCase(1) ? '==?' : '==#'
-    call filter(items, 'strpart(v:val, 0, strlen(a:1)) ' . cmp . ' a:1')
+    call filter(items, 'strpart(v:val, 0, strlen(match)) ' . cmp . ' match')
   endif
   return items
 endfunction
@@ -1831,7 +2326,7 @@ function! fugitive#CompletePath(base, ...) abort
   endif
   if base =~# '^\.git/' && len(dir)
     let pattern = s:gsub(base[5:-1], '/', '*&').'*'
-    let fdir = fugitive#Find(dir . '/')
+    let fdir = fugitive#Find('.git/', dir)
     let matches = s:GlobComplete(fdir, pattern)
     let cdir = fugitive#Find('.git/refs', dir)[0 : -5]
     if len(cdir) && s:cpath(fdir) !=# s:cpath(cdir)
@@ -1873,42 +2368,45 @@ function! fugitive#CompleteObject(base, ...) abort
   if len(tree) && s:cpath(tree . '/', cwd[0 : len(tree)])
     let subdir = strpart(cwd, len(tree) + 1) . '/'
   endif
+  let base = s:Expand(a:base)
 
-  if a:base =~# '^\.\=/\|^:(' || a:base !~# ':'
+  if a:base =~# '^!\d*$' && base !~# '^!'
+    return [base]
+  elseif base =~# '^\.\=/\|^:(' || base !~# ':'
     let results = []
-    if a:base =~# '^refs/'
+    if base =~# '^refs/'
       let cdir = fugitive#Find('.git/refs', dir)[0 : -5]
-      let results += map(s:GlobComplete(cdir, a:base . '*'), 's:Slash(v:val)')
+      let results += map(s:GlobComplete(cdir, base . '*'), 's:Slash(v:val)')
       call map(results, 's:fnameescape(v:val)')
-    elseif a:base !~# '^\.\=/\|^:('
+    elseif base !~# '^\.\=/\|^:('
       let heads = s:CompleteHeads(dir)
       if filereadable(fugitive#Find('.git/refs/stash', dir))
         let heads += ["stash"]
         let heads += sort(s:LinesError(["stash","list","--pretty=format:%gd"], dir)[0])
       endif
-      let results += s:FilterEscape(heads, a:base)
+      let results += s:FilterEscape(heads, base)
     endif
-    let results += a:0 == 1 || a:0 >= 3 ? fugitive#CompletePath(a:base, 0, '', dir, a:0 >= 4 ? a:4 : tree) : fugitive#CompletePath(a:base)
+    let results += a:0 == 1 || a:0 >= 3 ? fugitive#CompletePath(base, 0, '', dir, a:0 >= 4 ? a:4 : tree) : fugitive#CompletePath(base)
     return results
 
-  elseif a:base =~# '^:'
+  elseif base =~# '^:'
     let entries = s:LinesError(['ls-files','--stage'], dir)[0]
-    if a:base =~# ':\./'
+    if base =~# ':\./'
       call map(entries, 'substitute(v:val, "\\M\t\\zs" . subdir, "./", "")')
     endif
     call map(entries,'s:sub(v:val,".*(\\d)\\t(.*)",":\\1:\\2")')
-    if a:base !~# '^:[0-3]\%(:\|$\)'
+    if base !~# '^:[0-3]\%(:\|$\)'
       call filter(entries,'v:val[1] == "0"')
       call map(entries,'v:val[2:-1]')
     endif
 
   else
-    let parent = matchstr(a:base, '.*[:/]')
+    let parent = matchstr(base, '.*[:/]')
     let entries = s:LinesError(['ls-tree', substitute(parent,  ':\zs\./', '\=subdir', '')], dir)[0]
     call map(entries,'s:sub(v:val,"^04.*\\zs$","/")')
     call map(entries,'parent.s:sub(v:val,".*\t","")')
   endif
-  return s:FilterEscape(entries, a:base)
+  return s:FilterEscape(entries, base)
 endfunction
 
 function! s:CompleteSub(subcommand, A, L, P, ...) abort
@@ -1916,7 +2414,7 @@ function! s:CompleteSub(subcommand, A, L, P, ...) abort
   if pre =~# ' -- '
     return fugitive#CompletePath(a:A)
   elseif a:A =~# '^-' || a:A is# 0
-    return s:FilterEscape(split(s:ChompDefault('', a:subcommand, '--git-completion-helper'), ' '), a:A)
+    return s:FilterEscape(split(s:ChompDefault('', [a:subcommand, '--git-completion-helper']), ' '), a:A)
   elseif !a:0
     return fugitive#CompleteObject(a:A, s:Dir())
   elseif type(a:1) == type(function('tr'))
@@ -1945,11 +2443,16 @@ endfunction
 
 " Section: Buffer auto-commands
 
+augroup fugitive_dummy_events
+  autocmd!
+  autocmd User Fugitive* "
+augroup END
+
 function! s:ReplaceCmd(cmd) abort
   let temp = tempname()
-  let [err, exec_error] = s:TempCmd(temp, a:cmd)
+  let [err, exec_error] = s:StdoutToFile(temp, a:cmd)
   if exec_error
-    call s:throw((len(err) ? err : 'unknown error running ' . a:cmd))
+    throw 'fugitive: ' . (len(err) ? substitute(err, "\n$", '', '') : 'unknown error running ' . string(a:cmd))
   endif
   setlocal noswapfile
   silent exe 'lockmarks keepalt 0read ++edit' s:fnameescape(temp)
@@ -1966,8 +2469,8 @@ function! s:ReplaceCmd(cmd) abort
   endif
 endfunction
 
-function! s:QueryLog(refspec) abort
-  let lines = s:LinesError(['log', '-n', '256', '--pretty=format:%h%x09%s', a:refspec, '--'])[0]
+function! s:QueryLog(refspec, limit) abort
+  let lines = s:LinesError(['log', '-n', '' . a:limit, '--pretty=format:%h%x09%s', a:refspec, '--'])[0]
   call map(lines, 'split(v:val, "\t", 1)')
   call map(lines, '{"type": "Log", "commit": v:val[0], "subject": join(v:val[1 : -1], "\t")}')
   return lines
@@ -2017,6 +2520,20 @@ function! s:AddSection(label, lines, ...) abort
   call append(line('$'), ['', a:label . (len(note) ? ': ' . note : ' (' . len(a:lines) . ')')] + s:Format(a:lines))
 endfunction
 
+function! s:AddLogSection(label, a, b) abort
+  let limit = 256
+  let log = s:QueryLog(a:a . '..' . a:b, limit)
+  if empty(log)
+    return
+  elseif len(log) == limit
+    call remove(log, -1)
+    let label = a:label . ' (' . (limit - 1). '+)'
+  else
+    let label = a:label . ' (' . len(log) . ')'
+  endif
+  call append(line('$'), ['', label] + s:Format(log))
+endfunction
+
 let s:rebase_abbrevs = {
       \ 'p': 'pick',
       \ 'r': 'reword',
@@ -2041,8 +2558,8 @@ function! fugitive#BufReadStatus() abort
 
     let cmd = [fnamemodify(amatch, ':h')]
     setlocal noro ma nomodeline buftype=nowrite
-    if s:cpath(fnamemodify($GIT_INDEX_FILE !=# '' ? $GIT_INDEX_FILE : fugitive#Find('.git/index'), ':p')) !=# s:cpath(amatch)
-      let cmd += ['-c', 'GIT_INDEX_FILE=' . amatch]
+    if s:cpath(fnamemodify($GIT_INDEX_FILE !=# '' ? FugitiveVimPath($GIT_INDEX_FILE) : fugitive#Find('.git/index'), ':p')) !=# s:cpath(amatch)
+      let cmd += [{'env': {'GIT_INDEX_FILE': FugitiveGitPath(amatch)}}]
     endif
 
     if fugitive#GitVersion(2, 15)
@@ -2153,6 +2670,16 @@ function! fugitive#BufReadStatus() abort
       endwhile
     endif
 
+    let diff = {'Staged': {'stdout': ['']}, 'Unstaged': {'stdout': ['']}}
+    if len(staged)
+      let diff['Staged'] =
+          \ fugitive#Execute(['diff', '--color=never', '--no-ext-diff', '--no-prefix', '--cached'], function('len'))
+    endif
+    if len(unstaged)
+      let diff['Unstaged'] =
+          \ fugitive#Execute(['diff', '--color=never', '--no-ext-diff', '--no-prefix'], function('len'))
+    endif
+
     for dict in staged
       let b:fugitive_files['Staged'][dict.filename] = dict
     endfor
@@ -2229,16 +2756,10 @@ function! fugitive#BufReadStatus() abort
       endfor
     endif
 
-    let diff = {'Staged': [], 'Unstaged': []}
-    if len(staged)
-      let diff['Staged'] =
-          \ s:LinesError(['diff', '--color=never', '--no-ext-diff', '--no-prefix', '--cached'])[0]
-    endif
-    if len(unstaged)
-      let diff['Unstaged'] =
-          \ s:LinesError(['diff', '--color=never', '--no-ext-diff', '--no-prefix'])[0]
-    endif
     let b:fugitive_diff = diff
+    if v:cmdbang
+      unlet! b:fugitive_expanded
+    endif
     let expanded = get(b:, 'fugitive_expanded', {'Staged': {}, 'Unstaged': {}})
     let b:fugitive_expanded = {'Staged': {}, 'Unstaged': {}}
 
@@ -2249,10 +2770,12 @@ function! fugitive#BufReadStatus() abort
     if push !=# pull
       call s:AddHeader('Push', push)
     endif
-    if get(fugitive#ConfigGetAll('core.bare', config), 0, 'true') !~# '^\%(false\|no|off\|0\|\)$'
-      call s:AddHeader('Bare', 'yes')
-    elseif empty(s:Tree())
-      call s:AddHeader('Error', s:worktree_error)
+    if empty(s:Tree())
+      if get(fugitive#ConfigGetAll('core.bare', config), 0, 'true') !~# '^\%(false\|no|off\|0\|\)$'
+        call s:AddHeader('Bare', 'yes')
+      else
+        call s:AddHeader('Error', s:worktree_error)
+      endif
     endif
     if get(fugitive#ConfigGetAll('advice.statusHints', config), 0, 'true') !~# '^\%(false\|no|off\|0\|\)$'
       call s:AddHeader('Help', 'g?')
@@ -2266,16 +2789,16 @@ function! fugitive#BufReadStatus() abort
     let staged_end = len(staged) ? line('$') : 0
 
     if len(pull) && get(props, 'branch.ab') !~# ' -0$'
-      call s:AddSection('Unpulled from ' . pull, s:QueryLog(head . '..' . pull))
+      call s:AddLogSection('Unpulled from ' . pull, head, pull)
     endif
     if len(push) && push !=# pull
-      call s:AddSection('Unpulled from ' . push, s:QueryLog(head . '..' . push))
+      call s:AddLogSection('Unpulled from ' . push, head, push)
     endif
     if len(pull) && push !=# pull
-      call s:AddSection('Unpushed to ' . pull, s:QueryLog(pull . '..' . head))
+      call s:AddLogSection('Unpushed to ' . pull, pull, head)
     endif
     if len(push) && !(push ==# pull && get(props, 'branch.ab') =~# '^+0 ')
-      call s:AddSection('Unpushed to ' . push, s:QueryLog(push . '..' . head))
+      call s:AddLogSection('Unpushed to ' . push, push, head)
     endif
 
     setlocal nomodified readonly noswapfile
@@ -2284,7 +2807,9 @@ function! fugitive#BufReadStatus() abort
     if &bufhidden ==# ''
       setlocal bufhidden=delete
     endif
-    let b:dispatch = '-dir=' . fnameescape(len(s:Tree()) ? s:Tree() : s:Dir()) . ' ' . s:GitShellCmd() . ' fetch --all'
+    if !exists('b:dispatch')
+      let b:dispatch = ':Git fetch --all'
+    endif
     call fugitive#MapJumps()
     call s:Map('n', '-', ":<C-U>execute <SID>Do('Toggle',0)<CR>", '<silent>')
     call s:Map('x', '-', ":<C-U>execute <SID>Do('Toggle',1)<CR>", '<silent>')
@@ -2292,14 +2817,14 @@ function! fugitive#BufReadStatus() abort
     call s:Map('x', 's', ":<C-U>execute <SID>Do('Stage',1)<CR>", '<silent>')
     call s:Map('n', 'u', ":<C-U>execute <SID>Do('Unstage',0)<CR>", '<silent>')
     call s:Map('x', 'u', ":<C-U>execute <SID>Do('Unstage',1)<CR>", '<silent>')
-    call s:Map('n', 'U', ":exe <SID>EchoExec('reset', '-q')<CR>", '<silent>')
+    call s:Map('n', 'U', ":<C-U>Git reset -q<CR>", '<silent>')
     call s:MapMotion('gu', "exe <SID>StageJump(v:count, 'Untracked', 'Unstaged')")
     call s:MapMotion('gU', "exe <SID>StageJump(v:count, 'Unstaged', 'Untracked')")
     call s:MapMotion('gs', "exe <SID>StageJump(v:count, 'Staged')")
     call s:MapMotion('gp', "exe <SID>StageJump(v:count, 'Unpushed')")
     call s:MapMotion('gP', "exe <SID>StageJump(v:count, 'Unpulled')")
     call s:MapMotion('gr', "exe <SID>StageJump(v:count, 'Rebasing')")
-    call s:Map('n', 'C', ":echoerr 'fugitive: C has been removed in favor of cc'<CR>", '<silent>')
+    call s:Map('n', 'C', ":echoerr 'fugitive: C has been removed in favor of cc'<CR>", '<silent><unique>')
     call s:Map('n', 'a', ":<C-U>execute <SID>Do('Toggle',0)<CR>", '<silent>')
     call s:Map('n', 'i', ":<C-U>execute <SID>NextExpandedHunk(v:count1)<CR>", '<silent>')
     call s:Map('n', "=", ":<C-U>execute <SID>StageInline('toggle',line('.'),v:count)<CR>", '<silent>')
@@ -2308,7 +2833,7 @@ function! fugitive#BufReadStatus() abort
     call s:Map('x', "=", ":<C-U>execute <SID>StageInline('toggle',line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>')
     call s:Map('x', "<", ":<C-U>execute <SID>StageInline('hide',  line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>')
     call s:Map('x', ">", ":<C-U>execute <SID>StageInline('show',  line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>')
-    call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent>')
+    call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent><unique>')
     call s:Map('n', 'dd', ":<C-U>execute <SID>StageDiff('Gdiffsplit')<CR>", '<silent>')
     call s:Map('n', 'dh', ":<C-U>execute <SID>StageDiff('Ghdiffsplit')<CR>", '<silent>')
     call s:Map('n', 'ds', ":<C-U>execute <SID>StageDiff('Ghdiffsplit')<CR>", '<silent>')
@@ -2322,12 +2847,12 @@ function! fugitive#BufReadStatus() abort
     call s:Map('n', 'I', ":<C-U>execute <SID>StagePatch(line('.'),line('.'))<CR>", '<silent>')
     call s:Map('x', 'I', ":<C-U>execute <SID>StagePatch(line(\"'<\"),line(\"'>\"))<CR>", '<silent>')
     if empty(mapcheck('q', 'n'))
-      nnoremap <buffer> <silent> q :echoerr "fugitive: q removed in favor of gq (or :q)"<CR>
+      nnoremap <buffer> <silent> q :<C-U>echoerr "fugitive: q is removed in favor of gq (or :q)"<CR>
     endif
     call s:Map('n', 'gq', ":<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR>", '<silent>')
     call s:Map('n', 'R', ":echohl WarningMsg<Bar>echo 'Reloading is automatic.  Use :e to force'<Bar>echohl NONE<CR>", '<silent>')
-    call s:Map('n', 'g<Bar>', ":<C-U>echoerr 'Changed to X'<CR>", '<silent>')
-    call s:Map('x', 'g<Bar>', ":<C-U>echoerr 'Changed to X'<CR>", '<silent>')
+    call s:Map('n', 'g<Bar>', ":<C-U>echoerr 'Changed to X'<CR>", '<silent><unique>')
+    call s:Map('x', 'g<Bar>', ":<C-U>echoerr 'Changed to X'<CR>", '<silent><unique>')
     call s:Map('n', 'X', ":<C-U>execute <SID>StageDelete(line('.'), 0, v:count)<CR>", '<silent>')
     call s:Map('x', 'X', ":<C-U>execute <SID>StageDelete(line(\"'<\"), line(\"'>\"), v:count)<CR>", '<silent>')
     call s:Map('n', 'gI', ":<C-U>execute <SID>StageIgnore(line('.'), line('.'), v:count)<CR>", '<silent>')
@@ -2347,7 +2872,7 @@ function! fugitive#BufReadStatus() abort
     endfor
 
     let b:fugitive_reltime = reltime()
-    return 'silent ' . s:DoAutocmd('User FugitiveIndex')
+    return s:DoAutocmd('User FugitiveIndex')
   catch /^fugitive:/
     return 'echoerr ' . string(v:exception)
   endtry
@@ -2361,11 +2886,18 @@ function! fugitive#FileReadCmd(...) abort
     return 'noautocmd ' . line . 'read ' . s:fnameescape(amatch)
   endif
   if rev !~# ':' && s:ChompDefault('', [dir, 'cat-file', '-t', rev]) =~# '^\%(commit\|tag\)$'
-    let cmd = fugitive#Prepare(dir, 'log', '--pretty=format:%B', '-1', rev, '--')
+    let cmd = [dir, 'log', '--pretty=format:%B', '-1', rev, '--']
   else
-    let cmd = fugitive#Prepare(dir, 'cat-file', '-p', rev)
+    let cmd = [dir, 'cat-file', '-p', rev, '--']
+  endif
+  let temp = tempname()
+  let [err, exec_error] = s:StdoutToFile(temp, cmd)
+  if exec_error
+    call delete(temp)
+    return 'noautocmd ' . line . 'read ' . s:fnameescape(amatch)
+  else
+    return 'silent keepalt ' . line . 'read ' . s:fnameescape(temp) . '|call delete(' . string(temp) . ')'
   endif
-  return line . 'read !' . escape(cmd, '!#%')
 endfunction
 
 function! fugitive#FileWriteCmd(...) abort
@@ -2381,8 +2913,8 @@ function! fugitive#FileWriteCmd(...) abort
       return "noautocmd '[,']write" . (v:cmdbang ? '!' : '') . ' ' . s:fnameescape(amatch)
     endif
     silent execute "noautocmd keepalt '[,']write ".temp
-    let hash = s:TreeChomp([dir, 'hash-object', '-w', '--', temp])
-    let old_mode = matchstr(s:ChompError(['ls-files', '--stage', '.' . file], dir)[0], '^\d\+')
+    let hash = s:TreeChomp([dir, '--literal-pathspecs', 'hash-object', '-w', '--', FugitiveGitPath(temp)])
+    let old_mode = matchstr(s:ChompDefault('', ['ls-files', '--stage', '.' . file], dir), '^\d\+')
     if empty(old_mode)
       let old_mode = executable(s:Tree(dir) . file) ? '100755' : '100644'
     endif
@@ -2392,6 +2924,7 @@ function! fugitive#FileWriteCmd(...) abort
       if exists('#' . autype . 'WritePost')
         execute s:DoAutocmd(autype . 'WritePost ' . s:fnameescape(amatch))
       endif
+      exe s:DoAutocmdChanged(dir)
       return ''
     else
       return 'echoerr '.string('fugitive: '.error)
@@ -2410,18 +2943,19 @@ function! fugitive#BufReadCmd(...) abort
     if empty(dir)
       return 'echo "Invalid Fugitive URL"'
     endif
-    let b:git_dir = dir
+    let b:git_dir = s:GitDir(dir)
     if rev =~# '^:\d$'
       let b:fugitive_type = 'stage'
     else
-      let [b:fugitive_type, exec_error] = s:ChompError([dir, 'cat-file', '-t', rev])
-      if exec_error && rev =~# '^:0'
-        let sha = s:ChompDefault('', dir, 'write-tree', '--prefix=' . rev[3:-1])
-        let exec_error = empty(sha)
-        let b:fugitive_type = exec_error ? '' : 'tree'
+      let r = fugitive#Execute([dir, 'cat-file', '-t', rev])
+      let b:fugitive_type = get(r.stdout, 0, '')
+      if r.exit_status && rev =~# '^:0'
+        let r = fugitive#Execute([dir, 'write-tree', '--prefix=' . rev[3:-1]])
+        let sha = get(r.stdout, 0, '')
+        let b:fugitive_type = 'tree'
       endif
-      if exec_error
-        let error = b:fugitive_type
+      if r.exit_status
+        let error = substitute(join(r.stderr, "\n"), "\n*$", '', '')
         unlet b:fugitive_type
         setlocal noswapfile
         if empty(&bufhidden)
@@ -2451,6 +2985,8 @@ function! fugitive#BufReadCmd(...) abort
     silent keepjumps %delete_
     setlocal endofline
 
+    let events = ['User FugitiveObject', 'User Fugitive' . substitute(b:fugitive_type, '^\l', '\u&', '')]
+
     try
       if b:fugitive_type !=# 'blob'
         setlocal foldmarker=<<<<<<<<,>>>>>>>>
@@ -2496,12 +3032,16 @@ function! fugitive#BufReadCmd(...) abort
       elseif b:fugitive_type ==# 'stage'
         call s:ReplaceCmd([dir, 'ls-files', '--stage'])
       elseif b:fugitive_type ==# 'blob'
-        call s:ReplaceCmd([dir, 'cat-file', b:fugitive_type, rev])
+        let blob_or_filters = rev =~# ':' && fugitive#GitVersion(2, 11) ? '--filters' : 'blob'
+        call s:ReplaceCmd([dir, 'cat-file', blob_or_filters, rev])
       endif
     finally
       keepjumps call setpos('.',pos)
       setlocal nomodified noswapfile
       let modifiable = rev =~# '^:.:' && b:fugitive_type !=# 'tree'
+      if modifiable
+        let events = ['User FugitiveStageBlob']
+      endif
       let &l:readonly = !modifiable || !filewritable(fugitive#Find('.git/index', dir))
       if empty(&bufhidden)
         setlocal bufhidden=delete
@@ -2518,8 +3058,8 @@ function! fugitive#BufReadCmd(...) abort
     setlocal modifiable
 
     return 'silent ' . s:DoAutocmd('BufReadPost') .
-          \ (modifiable ? '' : '|setl nomodifiable') . '|silent ' .
-          \ s:DoAutocmd('User Fugitive' . substitute(b:fugitive_type, '^\l', '\u&', ''))
+          \ (modifiable ? '' : '|setl nomodifiable') . '|' .
+          \ call('s:DoAutocmd', events)
   catch /^fugitive:/
     return 'echoerr ' . string(v:exception)
   endtry
@@ -2568,6 +3108,26 @@ function! fugitive#Result(...) abort
   endif
 endfunction
 
+function! s:TempDotMap() abort
+  let cfile = s:cfile()
+  if empty(cfile)
+    if getline('.') =~# '^[*+] \+\f' && col('.') < 2
+      return matchstr(getline('.'), '^. \+\zs\f\+')
+    else
+      return expand('<cfile>')
+    endif
+  endif
+  let name = fugitive#Find(cfile[0])
+  let [dir, commit, file] = s:DirCommitFile(name)
+  if len(commit) && empty(file)
+    return commit
+  elseif s:cpath(s:Tree(), getcwd())
+    return fugitive#Path(name, "./")
+  else
+    return fugitive#Real(name)
+  endif
+endfunction
+
 function! s:TempReadPre(file) abort
   if has_key(s:temp_files, s:cpath(a:file))
     let dict = s:temp_files[s:cpath(a:file)]
@@ -2577,8 +3137,8 @@ function! s:TempReadPre(file) abort
     endif
     setlocal buftype=nowrite
     setlocal nomodifiable
-    let b:git_dir = dict.dir
-    if len(dict.dir)
+    let b:git_dir = dict.git_dir
+    if len(dict.git_dir)
       call extend(b:, {'fugitive_type': 'temp'}, 'keep')
     endif
   endif
@@ -2592,8 +3152,13 @@ function! s:TempReadPost(file) abort
     endif
     if get(dict, 'filetype', '') ==# 'git'
       call fugitive#MapJumps()
+      call s:Map('n', '.', ":<C-U> <C-R>=<SID>fnameescape(<SID>TempDotMap())<CR><Home>")
+      call s:Map('x', '.', ":<C-U> <C-R>=<SID>fnameescape(<SID>TempDotMap())<CR><Home>")
     endif
     if has_key(dict, 'filetype')
+      if dict.filetype ==# 'man' && has('nvim')
+        let b:man_sect = matchstr(getline(1), '^\w\+(\zs\d\+\ze)')
+      endif
       let &l:filetype = dict.filetype
     endif
     setlocal foldmarker=<<<<<<<<,>>>>>>>>
@@ -2604,7 +3169,7 @@ function! s:TempReadPost(file) abort
       call s:Map('n', 'gq', ":<C-U>bdelete<CR>", '<silent> <unique>')
     endif
   endif
-  return ''
+  return s:DoAutocmd('User FugitivePager')
 endfunction
 
 function! s:TempDelete(file) abort
@@ -2628,7 +3193,7 @@ augroup END
 function! s:AskPassArgs(dir) abort
   if (len($DISPLAY) || len($TERM_PROGRAM) || has('gui_running')) &&
         \ empty($GIT_ASKPASS) && empty($SSH_ASKPASS) && empty(fugitive#ConfigGetAll('core.askpass', a:dir))
-    if s:executable(s:ExecPath() . '/git-gui--askpass')
+    if s:executable(FugitiveVimPath(s:ExecPath() . '/git-gui--askpass'))
       return ['-c', 'core.askPass=' . s:ExecPath() . '/git-gui--askpass']
     elseif s:executable('ssh-askpass')
       return ['-c', 'core.askPass=ssh-askpass']
@@ -2637,10 +3202,6 @@ function! s:AskPassArgs(dir) abort
   return []
 endfunction
 
-function! s:RunJobs() abort
-  return (exists('*job_start') || exists('*jobstart')) && exists('*bufwinid')
-endfunction
-
 function! s:RunSave(state) abort
   let s:temp_files[s:cpath(a:state.file)] = a:state
 endfunction
@@ -2657,7 +3218,7 @@ function! s:RunFinished(state, ...) abort
   if !has_key(a:state, 'capture_bufnr')
     return
   endif
-  call fugitive#ReloadStatus(a:state, 1)
+  call fugitive#DidChange(a:state)
 endfunction
 
 function! s:RunEdit(state, tmp, job) abort
@@ -2669,8 +3230,18 @@ function! s:RunEdit(state, tmp, job) abort
   let file = FugitiveVimPath(readfile(sentinel, '', 1)[0])
   exe substitute(a:state.mods, '\<tab\>', '-tab', 'g') 'keepalt split' s:fnameescape(file)
   set bufhidden=wipe
-  let s:edit_jobs[bufnr('')] = [a:state, a:tmp, a:job, sentinel]
-  call fugitive#ReloadStatus(a:state.dir, 1)
+  let bufnr = bufnr('')
+  let s:edit_jobs[bufnr] = [a:state, a:tmp, a:job, sentinel]
+  call fugitive#DidChange(a:state.git_dir)
+  if bufnr == bufnr('') && !exists('g:fugitive_event')
+    try
+      let g:fugitive_event = a:state.git_dir
+      let g:fugitive_result = a:state
+      exe s:DoAutocmd('User FugitiveEditor')
+    finally
+      unlet! g:fugitive_event g:fugitive_result
+    endtry
+  endif
   return 1
 endfunction
 
@@ -2724,11 +3295,7 @@ function! s:RunReceive(state, tmp, type, job, data, ...) abort
       call setbufline(a:state.capture_bufnr, line_count + 1, lines)
     endif
     call setbufvar(a:state.capture_bufnr, '&modifiable', 0)
-    if !getwinvar(bufwinid(a:state.capture_bufnr), '&previewwindow')
-      " no-op
-    elseif exists('*win_execute')
-      call win_execute(bufwinid(a:state.capture_bufnr), '$')
-    else
+    if getwinvar(bufwinid(a:state.capture_bufnr), '&previewwindow')
       let winnr = bufwinnr(a:state.capture_bufnr)
       if winnr > 0
         let old_winnr = winnr()
@@ -2831,15 +3398,19 @@ function! s:RunWait(state, tmp, job, ...) abort
     call delete(a:1)
   endif
   try
+    if a:tmp.no_more && &more
+      let more = &more
+      let &more = 0
+    endif
     while get(a:state, 'request', '') !=# 'edit' && s:RunTick(a:job)
       call s:RunEcho(a:tmp)
-      if !get(a:state, 'closed_in')
+      if !get(a:tmp, 'closed_in')
         let peek = getchar(1)
         if peek != 0 && !(has('win32') && peek == 128)
           let c = getchar()
           let c = type(c) == type(0) ? nr2char(c) : c
           if c ==# "\<C-D>" || c ==# "\<Esc>"
-            let a:state.closed_in = 1
+            let a:tmp.closed_in = 1
             let can_pedit = s:RunCloseIn(a:job) && exists('*setbufline')
             for winnr in range(1, winnr('$'))
               if getwinvar(winnr, '&previewwindow') && getbufvar(winbufnr(winnr), '&modified')
@@ -2851,7 +3422,7 @@ function! s:RunWait(state, tmp, job, ...) abort
                 call remove(a:tmp, 'echo')
               endif
               call writefile(['fugitive: aborting edit due to background operation.'], a:state.file . '.exit')
-              exe (&splitbelow ? 'botright' : 'topleft') 'silent pedit ++ff=unix' fnameescape(a:state.file)
+              exe (&splitbelow ? 'botright' : 'topleft') 'silent pedit ++ff=unix' s:fnameescape(a:state.file)
               let a:state.capture_bufnr = bufnr(a:state.file)
               call setbufvar(a:state.capture_bufnr, '&modified', 1)
               let finished = 0
@@ -2877,9 +3448,12 @@ function! s:RunWait(state, tmp, job, ...) abort
     endif
     let finished = !s:RunEdit(a:state, a:tmp, a:job)
   finally
+    if exists('l:more')
+      let &more = more
+    endif
     if !exists('finished')
       try
-        if a:state.pty && !get(a:state, 'closed_in')
+        if a:state.pty && !get(a:tmp, 'closed_in')
           call s:RunSend(a:job, "\<C-C>")
         elseif type(a:job) == type(0)
           call jobstop(a:job)
@@ -2889,7 +3463,7 @@ function! s:RunWait(state, tmp, job, ...) abort
       catch /.*/
       endtry
     elseif finished
-      call fugitive#ReloadStatus(a:state, 1)
+      call fugitive#DidChange(a:state)
     endif
   endtry
   return ''
@@ -2938,6 +3512,11 @@ augroup fugitive_job
         \ endfor
 augroup END
 
+function! fugitive#CanPty() abort
+  return get(g:, 'fugitive_pty_debug_override',
+        \ has('unix') && !has('win32unix') && (has('patch-8.0.0744') || has('nvim')) && fugitive#GitVersion() !~# '\.windows\>')
+endfunction
+
 function! fugitive#PagerFor(argv, ...) abort
   let args = a:argv
   if empty(args)
@@ -2983,19 +3562,24 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
     exe s:DirCheck(dir)
   endif
   let config = copy(fugitive#Config(dir))
-  let [args, after] = s:SplitExpandChain(a:arg, s:Tree(dir))
+  let curwin = a:arg =~# '^++curwin\>' || !a:line2
+  let [args, after] = s:SplitExpandChain(substitute(a:arg, '^++curwin\>\s*', '', ''), s:Tree(dir))
   let flags = []
   let pager = -1
+  let explicit_pathspec_option = 0
   while len(args)
     if args[0] ==# '-c' && len(args) > 1
       call extend(flags, remove(args, 0, 1))
     elseif args[0] =~# '^-p$\|^--paginate$'
-      let pager = 1
+      let pager = 2
       call remove(args, 0)
     elseif args[0] =~# '^-P$\|^--no-pager$'
       let pager = 0
       call remove(args, 0)
-    elseif args[0] =~# '^--\%([[:lower:]-]\+-pathspecs\|no-optional-locks\)$'
+    elseif args[0] =~# '^--\%([[:lower:]-]\+-pathspecs\)$'
+      let explicit_pathspec_option = 1
+      call add(flags, remove(args, 0))
+    elseif args[0] =~# '^\%(--no-optional-locks\)$'
       call add(flags, remove(args, 0))
     elseif args[0] =~# '^-C$\|^--\%(exec-path=\|git-dir=\|work-tree=\|bare$\)'
       return 'echoerr ' . string('fugitive: ' . args[0] . ' is not supported')
@@ -3003,36 +3587,14 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
       break
     endif
   endwhile
-  if pager is# 0
+  if !explicit_pathspec_option
+    call insert(flags, '--no-literal-pathspecs')
+  endif
+  let no_pager = pager is# 0
+  if no_pager
     call add(flags, '--no-pager')
   endif
-  if empty(args) && pager is# -1
-    let cmd = s:StatusCommand(a:line1, a:line2, a:range, a:line2, a:bang, a:mods, '', '', [])
-    return (empty(cmd) ? 'exe' : cmd) . after
-  endif
-  let alias = FugitiveConfigGet('alias.' . get(args, 0, ''), config)
-  if get(args, 1, '') !=# '--help' && alias !~# '^$\|^!\|[\"'']' && !filereadable(s:ExecPath() . '/git-' . args[0])
-        \ && !(has('win32') && filereadable(s:ExecPath() . '/git-' . args[0] . '.exe'))
-    call remove(args, 0)
-    call extend(args, split(alias, '\s\+'), 'keep')
-  endif
-  let name = substitute(get(args, 0, ''), '\%(^\|-\)\(\l\)', '\u\1', 'g')
-  let git = s:UserCommandList()
-  let options = {'git': git, 'dir': dir, 'flags': flags}
-  if pager is# -1 && name =~# '^\a\+$' && exists('*s:' . name . 'Subcommand') && get(args, 1, '') !=# '--help'
-    try
-      let overrides = s:{name}Subcommand(a:line1, a:line2, a:range, a:bang, a:mods, extend({'subcommand': args[0], 'subcommand_args': args[1:-1]}, options))
-      if type(overrides) == type('')
-        return 'exe ' . string(overrides) . after
-      endif
-      let args = [get(overrides, 'command', args[0])] + get(overrides, 'insert_args', []) + args[1:-1]
-    catch /^fugitive:/
-      return 'echoerr ' . string(v:exception)
-    endtry
-  else
-    let overrides = {}
-  endif
-  let env = get(overrides, 'env', {})
+  let env = {}
   let i = 0
   while i < len(flags) - 1
     if flags[i] ==# '-c'
@@ -3049,60 +3611,97 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
     endif
     let i += 1
   endwhile
-  let editcmd = a:line2 ? 'split' : 'edit'
-  if pager is# 1
-    if a:bang && a:line2 >= 0
-      let editcmd = 'read'
-    elseif a:bang
-      let editcmd = 'pedit'
-    endif
-  elseif pager is# -1
-    let pager = fugitive#PagerFor(args, config)
-    if a:bang && pager isnot# 1
-      return 'echoerr ' .  string('fugitive: :Git! for temp buffer output has been replaced by :Git --paginate')
-    endif
+  let options = {'git': s:UserCommandList(), 'git_dir': s:GitDir(dir), 'flags': flags, 'curwin': curwin}
+  if empty(args) && pager is# -1
+    let cmd = s:StatusCommand(a:line1, a:line2, a:range, curwin ? 0 : a:line2, a:bang, a:mods, '', '', [], options)
+    return (empty(cmd) ? 'exe' : cmd) . after
   endif
-  if (s:HasOpt(args, ['add', 'checkout', 'commit', 'stage', 'stash', 'reset'], '-p', '--patch') ||
-        \ s:HasOpt(args, ['add', 'clean', 'stage'], '-i', '--interactive') ||
-        \ type(pager) == type('')) && pager isnot# 1
+  let alias = FugitiveConfigGet('alias.' . get(args, 0, ''), config)
+  if get(args, 1, '') !=# '--help' && alias !~# '^$\|^!\|[\"'']' && !filereadable(FugitiveVimPath(s:ExecPath() . '/git-' . args[0]))
+        \ && !(has('win32') && filereadable(FugitiveVimPath(s:ExecPath() . '/git-' . args[0] . '.exe')))
+    call remove(args, 0)
+    call extend(args, split(alias, '\s\+'), 'keep')
+  endif
+  let name = substitute(get(args, 0, ''), '\%(^\|-\)\(\l\)', '\u\1', 'g')
+  if pager is# -1 && name =~# '^\a\+$' && exists('*s:' . name . 'Subcommand') && get(args, 1, '') !=# '--help'
+    try
+      let overrides = s:{name}Subcommand(a:line1, a:line2, a:range, a:bang, a:mods, extend({'subcommand': args[0], 'subcommand_args': args[1:-1]}, options))
+      if type(overrides) == type('')
+        return 'exe ' . string(overrides) . after
+      endif
+      let args = [get(overrides, 'command', args[0])] + get(overrides, 'insert_args', []) + args[1:-1]
+    catch /^fugitive:/
+      return 'echoerr ' . string(v:exception)
+    endtry
+  else
+    let overrides = {}
+  endif
+  call extend(env, get(overrides, 'env', {}))
+  call s:PrepareEnv(env, dir)
+  if pager is# -1
+    let pager = fugitive#PagerFor(args, config)
+  endif
+  let wants_terminal = type(pager) ==# type('') ||
+        \ (s:HasOpt(args, ['add', 'checkout', 'commit', 'reset', 'restore', 'stage', 'stash'], '-p', '--patch') ||
+        \ s:HasOpt(args, ['add', 'clean', 'stage'], '-i', '--interactive')) && pager is# 0
+  if wants_terminal
     let mods = substitute(s:Mods(a:mods), '\<tab\>', '-tab', 'g')
-    let assign = len(dir) ? '|let b:git_dir = ' . string(dir) : ''
+    let assign = len(dir) ? '|let b:git_dir = ' . string(options.git_dir) : ''
+    let argv = s:UserCommandList(options) + args
+    let term_opts = len(env) ? {'env': env} : {}
     if has('nvim')
       call fugitive#Autowrite()
-      return mods . (a:line2 ? 'split' : 'edit') . ' term://' . s:fnameescape(s:UserCommand(options, args)) . assign . '|startinsert' . after
-    elseif has('terminal')
+      return mods . (curwin ? 'enew' : 'new') . '|call termopen(' . string(argv) . ', ' . string(term_opts) . ')' . assign . '|startinsert' . after
+    elseif exists('*term_start')
       call fugitive#Autowrite()
-      return 'exe ' . string(mods . 'terminal ' . (a:line2 ? '' : '++curwin ') . join(map(s:UserCommandList(options) + args, 's:fnameescape(v:val)'))) . assign . after
+      if curwin
+        let term_opts.curwin = 1
+      endif
+      return mods . 'call term_start(' . string(argv) . ', ' . string(term_opts) . ')' . assign . after
     endif
   endif
-  if pager is# 1 && editcmd ==# 'read'
-    return s:ReadExec(a:line1, a:line2, a:range, a:mods, env, args, options) . after
-  endif
   let state = {
-        \ 'git': git,
+        \ 'git': options.git,
         \ 'flags': flags,
         \ 'args': args,
-        \ 'dir': dir,
-        \ 'git_dir': dir,
+        \ 'dir': options.git_dir,
+        \ 'git_dir': options.git_dir,
         \ 'cwd': s:UserCommandCwd(dir),
         \ 'filetype': 'git',
         \ 'mods': s:Mods(a:mods),
         \ 'file': s:Resolve(tempname())}
-  if pager is# 1
+  let allow_pty = 1
+  let after_edit = ''
+  let stream = 0
+  if a:bang && pager isnot# 2
+    let pager = 1
+    let stream = exists('*setbufline')
+    let do_edit = substitute(s:Mods(a:mods, 'Edge'), '\<tab\>', '-tab', 'g') . 'pedit!'
+  elseif pager
+    let allow_pty = 0
+    if pager is# 2 && a:bang && a:line2 >= 0
+      let [do_edit, after_edit] = s:ReadPrepare(a:line1, a:line2, a:range, a:mods)
+    elseif pager is# 2 && a:bang
+      let do_edit = s:Mods(a:mods) . 'pedit'
+    elseif !curwin
+      let do_edit = s:Mods(a:mods) . 'split'
+    else
+      let do_edit = s:Mods(a:mods) . 'edit'
+      call s:BlurStatus()
+    endif
     call extend(env, {'COLUMNS': '' . get(g:, 'fugitive_columns', 80)}, 'keep')
-  else
-    call extend(env, {'COLUMNS': '' . &columns - 1}, 'keep')
   endif
-  if s:RunJobs() && pager isnot# 1
-    let state.pty = get(g:, 'fugitive_pty', has('unix') && !has('win32unix') && (has('patch-8.0.0744') || has('nvim')) && fugitive#GitVersion() !~# '\.windows\>')
+  if s:run_jobs
+    call extend(env, {'COLUMNS': '' . (&columns - 1)}, 'keep')
+    let state.pty = allow_pty && fugitive#CanPty()
     if !state.pty
       let args = s:AskPassArgs(dir) + args
     endif
     let tmp = {
+          \ 'no_more': no_pager || get(overrides, 'no_more'),
           \ 'line_count': 0,
           \ 'err': '',
           \ 'out': '',
-          \ 'echo': '',
           \ 'escape': ''}
     let env.FUGITIVE = state.file
     let editor = 'sh ' . s:TempScript(
@@ -3115,16 +3714,30 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
           \ 'NO_COLOR': '1',
           \ 'GIT_EDITOR': editor,
           \ 'GIT_SEQUENCE_EDITOR': editor,
-          \ 'GIT_MERGE_AUTOEDIT': '1',
           \ 'GIT_PAGER': 'cat',
           \ 'PAGER': 'cat'}, 'keep')
+    if len($GPG_TTY) && !has_key(env, 'GPG_TTY')
+      let env.GPG_TTY = ''
+      let did_override_gpg_tty = 1
+    endif
+    if stream
+      call writefile(['fugitive: aborting edit due to background operation.'], state.file . '.exit')
+    elseif pager
+      call writefile(['fugitive: aborting edit due to use of pager.'], state.file . '.exit')
+      let after = '|' . do_edit . ' ' . s:fnameescape(state.file) . after_edit . after
+    else
+      let env.GIT_MERGE_AUTOEDIT = '1'
+      let tmp.echo = ''
+    endif
     let args = s:disable_colors + flags + ['-c', 'advice.waitingForEditor=false'] + args
-    let argv = s:UserCommandList({'git': git, 'dir': dir}) + args
+    let argv = s:UserCommandList({'git': options.git, 'git_dir': options.git_dir}) + args
     let [argv, jobopts] = s:JobOpts(argv, env)
     call fugitive#Autowrite()
     call writefile([], state.file, 'b')
     call s:RunSave(state)
-    echo ""
+    if has_key(tmp, 'echo')
+      echo ""
+    endif
     if exists('*job_start')
       call extend(jobopts, {
             \ 'mode': 'raw',
@@ -3147,16 +3760,26 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
             \ }))
     endif
     let state.job = job
+    if pager
+      let tmp.closed_in = 1
+      call s:RunCloseIn(job)
+    endif
+    if stream
+      exe 'silent' do_edit '++ff=unix' s:fnameescape(state.file)
+      let state.capture_bufnr = bufnr(state.file)
+      call setbufvar(state.capture_bufnr, '&modified', 1)
+      return (after_edit . after)[1:-1]
+    endif
     call add(s:resume_queue, [state, tmp, job])
     return 'call fugitive#Resume()|silent checktime' . after
-  elseif pager is# 1
+  elseif pager
     let pre = s:BuildEnvPrefix(env)
     try
       if exists('+guioptions') && &guioptions =~# '!'
         let guioptions = &guioptions
         set guioptions-=!
       endif
-      silent! execute '!' . escape(pre . s:UserCommand({'git': git, 'dir': dir}, s:disable_colors + flags + ['--no-pager'] + args), '!#%') .
+      silent! execute '!' . escape(pre . s:shellesc(s:UserCommandList(options) + s:disable_colors + flags + ['--no-pager'] + args), '!#%') .
             \ (&shell =~# 'csh' ? ' >& ' . s:shellesc(state.file) : ' > ' . s:shellesc(state.file) . ' 2>&1')
       let state.exit_status = v:shell_error
     finally
@@ -3167,20 +3790,40 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
     redraw!
     call s:RunSave(state)
     call s:RunFinished(state)
-    if editcmd ==# 'edit'
-      call s:BlurStatus()
-    endif
-    return state.mods . editcmd . ' ' . s:fnameescape(state.file) .
-          \ '|call fugitive#ReloadStatus(fugitive#Result(' . string(state.file) . '), 1)' . after
+    return do_edit . ' ' . s:fnameescape(state.file) . after_edit .
+          \ '|call fugitive#DidChange(fugitive#Result(' . string(state.file) . '))' . after
   elseif has('win32')
     return 'echoerr ' . string('fugitive: Vim 8 with job support required to use :Git on Windows')
   elseif has('gui_running')
     return 'echoerr ' . string('fugitive: Vim 8 with job support required to use :Git in GVim')
   else
-    let pre = s:BuildEnvPrefix(env)
-    return 'exe ' . string('noautocmd !' . escape(pre . s:UserCommand(options, args), '!#%')) .
-          \ '|call fugitive#ReloadStatus(' . string(dir) . ', 1)' .
-          \ after
+    if !explicit_pathspec_option && get(options.flags, 0, '') ==# '--no-literal-pathspecs'
+      call remove(options.flags, 0)
+    endif
+    if exists('l:did_override_gpg_tty')
+      call remove(env, 'GPG_TTY')
+    endif
+    let cmd = s:BuildEnvPrefix(env) . s:shellesc(s:UserCommandList(options) + args)
+    let after = '|call fugitive#DidChange(' . string(dir) . ')' . after
+    if !wants_terminal && (no_pager || index(['add', 'clean', 'reset', 'restore', 'stage'], get(args, 0, '')) >= 0 || s:HasOpt(args, ['checkout'], '-q', '--quiet', '--no-progress'))
+      let output = substitute(s:SystemError(cmd)[0], "\n$", '', '')
+      if len(output)
+        try
+          if &more && no_pager
+            let more = 1
+            set nomore
+          endif
+          echo substitute(output, "\n$", "", "")
+        finally
+          if exists('l:more')
+            set more
+          endif
+        endtry
+      endif
+      return 'silent checktime' . after
+    else
+      return 'exe ' . string('noautocmd !' . escape(cmd, '!#%')) . after
+    endif
   endif
 endfunction
 
@@ -3188,7 +3831,7 @@ let s:exec_paths = {}
 function! s:ExecPath() abort
   let git = s:GitShellCmd()
   if !has_key(s:exec_paths, git)
-    let s:exec_paths[git] = s:sub(system(git.' --exec-path'),'\n$','')
+    let s:exec_paths[git] = get(s:JobExecute(s:GitCmd() + ['--exec-path'], {}, [], [], {}).stdout, 0, '')
   endif
   return s:exec_paths[git]
 endfunction
@@ -3208,7 +3851,7 @@ function! s:CompletableSubcommands(dir) abort
   let c_exec_path = s:cpath(s:ExecPath())
   if !has_key(s:path_subcommands, c_exec_path)
     if fugitive#GitVersion(2, 18)
-      let [lines, exec_error] = s:LinesError(a:dir, '--list-cmds=list-mainporcelain,nohelpers,list-complete')
+      let [lines, exec_error] = s:LinesError([a:dir, '--list-cmds=list-mainporcelain,nohelpers,list-complete'])
       call filter(lines, 'v:val =~# "^\\S\\+$"')
       if !exec_error && len(lines)
         let s:path_subcommands[c_exec_path] = lines
@@ -3258,11 +3901,15 @@ function! s:CompletableSubcommands(dir) abort
 endfunction
 
 function! fugitive#Complete(lead, ...) abort
-  let dir = a:0 == 1 ? a:1 : a:0 >= 3 ? a:3 : s:Dir()
+  let dir = a:0 == 1 ? a:1 : a:0 >= 3 ? s:Dir(a:3) : s:Dir()
   let root = a:0 >= 4 ? a:4 : s:Tree(s:Dir())
   let pre = a:0 > 1 ? strpart(a:1, 0, a:2) : ''
-  let subcmd = matchstr(pre, '\u\w*[! ] *\zs[[:alnum:]-]\+\ze ')
-  if empty(subcmd)
+  let subcmd = matchstr(pre, '\u\w*[! ] *\%(\%(++\S\+\|--\S\+-pathspecs\|-c\s\+\S\+\)\s\+\)*\zs[[:alnum:]][[:alnum:]-]*\ze ')
+  if empty(subcmd) && a:lead =~# '^+'
+    let results = ['++curwin']
+  elseif empty(subcmd) && a:lead =~# '^-'
+    let results = ['--literal-pathspecs', '--no-literal-pathspecs', '--glob-pathspecs', '--noglob-pathspecs', '--icase-pathspecs', '--no-optional-locks']
+  elseif empty(subcmd)
     let results = s:CompletableSubcommands(dir)
   elseif a:0 ==# 2 && subcmd =~# '^\%(commit\|revert\|push\|fetch\|pull\|merge\|rebase\)$'
     let cmdline = substitute(a:1, '\u\w*\([! ] *\)' . subcmd, 'G' . subcmd, '')
@@ -3271,7 +3918,7 @@ function! fugitive#Complete(lead, ...) abort
   elseif pre =~# ' -- '
     return fugitive#CompletePath(a:lead, a:1, a:2, dir, root)
   elseif a:lead =~# '^-'
-    let results = split(s:ChompDefault('', dir, subcmd, '--git-completion-helper'), ' ')
+    let results = split(s:ChompDefault('', [dir, subcmd, '--git-completion-helper']), ' ')
   else
     return fugitive#CompleteObject(a:lead, a:1, a:2, dir, root)
   endif
@@ -3302,10 +3949,10 @@ endfunction
 " Section: :Gstatus
 
 function! s:StatusCommand(line1, line2, range, count, bang, mods, reg, arg, args, ...) abort
-  let dir = a:0 ? a:1 : s:Dir()
+  let dir = a:0 ? s:Dir(a:1) : s:Dir()
   exe s:DirCheck(dir)
   try
-    let mods = s:Mods(a:mods, &splitbelow ? 'botright' : 'topleft')
+    let mods = s:Mods(a:mods, 'Edge')
     let file = fugitive#Find(':', dir)
     let arg = ' +setl\ foldmarker=<<<<<<<<,>>>>>>>>\|let\ w:fugitive_status=FugitiveGitDir() ' .
           \ s:fnameescape(file)
@@ -3370,7 +4017,7 @@ function! s:StageSeek(info, fallback) abort
   if empty(info.heading)
     return a:fallback
   endif
-  let line = search('^' . escape(info.heading, '^$.*[]~\') . ' (\d\+)$', 'wn')
+  let line = search('^' . escape(info.heading, '^$.*[]~\') . ' (\d\++\=)$', 'wn')
   if !line
     for section in get({'Staged': ['Unstaged', 'Untracked'], 'Unstaged': ['Untracked', 'Staged'], 'Untracked': ['Unstaged', 'Staged']}, info.section, [])
       let line = search('^' . section, 'wn')
@@ -3431,7 +4078,7 @@ function! s:DoAutocmdChanged(dir) abort
   endif
   try
     let g:fugitive_event = dir
-    if type(a:dir) == type({}) && has_key(a:dir, 'args')
+    if type(a:dir) == type({}) && has_key(a:dir, 'args') && has_key(a:dir, 'exit_status')
       let g:fugitive_result = a:dir
     endif
     exe s:DoAutocmd('User FugitiveChanged')
@@ -3467,7 +4114,7 @@ if !exists('s:last_times')
 endif
 
 function! s:ExpireStatus(bufnr) abort
-  if a:bufnr is# -2
+  if a:bufnr is# -2 || a:bufnr is# 0
     let s:head_cache = {}
     let s:last_time = reltime()
     return ''
@@ -3523,9 +4170,9 @@ function! s:ReloadTabStatus(...) abort
   unlet! t:fugitive_reload_status
 endfunction
 
-function! fugitive#ReloadStatus(...) abort
+function! fugitive#DidChange(...) abort
   call s:ExpireStatus(a:0 ? a:1 : -1)
-  if a:0 > 1 ? a:2 : 1
+  if a:0 > 1 ? a:2 : (!a:0 || a:1 isnot# 0)
     let t = reltime()
     let t:fugitive_reload_status = t
     for tabnr in exists('*settabvar') ? range(1, tabpagenr('$')) : []
@@ -3540,6 +4187,10 @@ function! fugitive#ReloadStatus(...) abort
   return ''
 endfunction
 
+function! fugitive#ReloadStatus(...) abort
+  return call('fugitive#DidChange', a:000)
+endfunction
+
 function! fugitive#EfmDir(...) abort
   let dir = matchstr(a:0 ? a:1 : &errorformat, '\c,%\\&\%(git\|fugitive\)_\=dir=\zs\%(\\.\|[^,]\)*')
   let dir = substitute(dir, '%%', '%', 'g')
@@ -3549,21 +4200,23 @@ endfunction
 
 augroup fugitive_status
   autocmd!
-  autocmd BufWritePost         * call fugitive#ReloadStatus(-1, 0)
-  autocmd ShellCmdPost,ShellFilterPost * nested call fugitive#ReloadStatus(-2, 0)
+  autocmd BufWritePost         * call fugitive#DidChange(+expand('<abuf>'), 0)
+  autocmd User FileChmodPost,FileUnlinkPost call fugitive#DidChange(+expand('<abuf>'), 0)
+  autocmd ShellCmdPost,ShellFilterPost * nested call fugitive#DidChange(0)
   autocmd BufDelete * nested
         \ if getbufvar(+expand('<abuf>'), 'buftype') ==# 'terminal' |
         \   if !empty(FugitiveGitDir(+expand('<abuf>'))) |
-        \     call fugitive#ReloadStatus(+expand('<abuf>'), 1) |
+        \     call fugitive#DidChange(+expand('<abuf>')) |
         \   else |
-        \     call fugitive#ReloadStatus(-2, 0) |
+        \     call fugitive#DidChange(0) |
         \  endif |
         \ endif
   autocmd QuickFixCmdPost make,lmake,[cl]file,[cl]getfile nested
-        \ call fugitive#ReloadStatus(fugitive#EfmDir(), 1)
-  if !has('win32')
-    autocmd FocusGained        * call fugitive#ReloadStatus(-2, 0)
-  endif
+        \ call fugitive#DidChange(fugitive#EfmDir())
+  autocmd FocusGained        *
+        \ if get(g:, 'fugitive_focus_gained', !has('win32')) |
+        \   call fugitive#DidChange(0) |
+        \ endif
   autocmd BufEnter index,index.lock
         \ call s:ReloadWinStatus()
   autocmd TabEnter *
@@ -3594,7 +4247,7 @@ function! s:StageInfo(...) abort
   let index = 0
   while len(getline(slnum - 1)) && empty(heading)
     let slnum -= 1
-    let heading = matchstr(getline(slnum), '^\u\l\+.\{-\}\ze (\d\+)$')
+    let heading = matchstr(getline(slnum), '^\u\l\+.\{-\}\ze (\d\++\=)$')
     if empty(heading) && getline(slnum) !~# '^[ @\+-]'
       let index += 1
     endif
@@ -3649,7 +4302,7 @@ function! s:Selection(arg1, ...) abort
   let index = 0
   while empty(heading)
     let slnum -= 1
-    let heading = matchstr(getline(slnum), '^\u\l\+.\{-\}\ze (\d\+)$')
+    let heading = matchstr(getline(slnum), '^\u\l\+.\{-\}\ze (\d\++\=)$')
     if empty(heading) && getline(slnum) !~# '^[ @\+-]'
       let index += 1
     endif
@@ -3669,7 +4322,7 @@ function! s:Selection(arg1, ...) abort
   let lnum = first - (arg1 == flnum ? 0 : 1)
   let root = s:Tree() . '/'
   while lnum <= last
-    let heading = matchstr(line, '^\u\l\+\ze.\{-\}\ze (\d\+)$')
+    let heading = matchstr(line, '^\u\l\+\ze.\{-\}\ze (\d\++\=)$')
     if len(heading)
       let template.heading = heading
       let template.section = matchstr(heading, '^\u\l\+')
@@ -4023,7 +4676,7 @@ function! s:StageInline(mode, ...) abort
     let diff = []
     let index = 0
     let start = -1
-    for line in b:fugitive_diff[info.section]
+    for line in fugitive#Wait(b:fugitive_diff[info.section]).stdout
       if mode ==# 'await' && line[0] ==# '@'
         let mode = 'capture'
       endif
@@ -4147,10 +4800,11 @@ function! s:StageApply(info, reverse, extra) abort
   endif
   let i = b:fugitive_expanded[info.section][info.filename][0]
   let head = []
-  while get(b:fugitive_diff[info.section], i, '@') !~# '^@'
-    let line = b:fugitive_diff[info.section][i]
+  let diff_lines = fugitive#Wait(b:fugitive_diff[info.section]).stdout
+  while get(diff_lines, i, '@') !~# '^@'
+    let line = diff_lines[i]
     if line ==# '--- /dev/null'
-      call add(head, '--- ' . get(b:fugitive_diff[info.section], i + 1, '')[4:-1])
+      call add(head, '--- ' . get(diff_lines, i + 1, '')[4:-1])
     elseif line !~# '^new file '
       call add(head, line)
     endif
@@ -4163,8 +4817,8 @@ function! s:StageApply(info, reverse, extra) abort
     call add(cmd, '--reverse')
   endif
   call extend(cmd, ['--', temp])
-  let [output, exec_error] = s:ChompError(cmd)
-  if !exec_error
+  let output = s:ChompStderr(cmd)
+  if empty(output)
     return 1
   endif
   call s:throw(output)
@@ -4175,9 +4829,13 @@ function! s:StageDelete(lnum1, lnum2, count) abort
 
   let err = ''
   let did_conflict_err = 0
+  let reset_commit = matchstr(getline(a:lnum1), '^Un\w\+ \%(to\| from\) \zs\S\+')
   try
     for info in s:Selection(a:lnum1, a:lnum2)
       if empty(info.paths)
+        if len(info.commit)
+          let reset_commit = info.commit . '^'
+        endif
         continue
       endif
       let sub = get(get(get(b:fugitive_files, info.section, {}), info.filename, {}), 'submodule')
@@ -4243,15 +4901,14 @@ function! s:StageDelete(lnum1, lnum2, count) abort
     let err .= '|echoerr ' . string(v:exception)
   endtry
   if empty(restore)
+    if len(reset_commit) && empty(err)
+      call feedkeys(':Git reset ' . reset_commit)
+    endif
     return err[1:-1]
   endif
   exe s:ReloadStatus()
   call s:StageReveal()
-  if len(restore)
-    return 'checktime|redraw|echomsg ' . string('To restore, ' . join(restore, '|')) . err
-  else
-    return 'checktime|redraw' . err
-  endif
+  return 'checktime|redraw|echomsg ' . string('To restore, ' . join(restore, '|')) . err
 endfunction
 
 function! s:StageIgnore(lnum1, lnum2, count) abort
@@ -4427,11 +5084,11 @@ function! s:StagePatch(lnum1,lnum2) abort
   for lnum in range(a:lnum1,a:lnum2)
     let info = s:StageInfo(lnum)
     if empty(info.paths) && info.section ==# 'Staged'
-      return 'Git reset --patch'
+      return 'tab Git reset --patch'
     elseif empty(info.paths) && info.section ==# 'Unstaged'
-      return 'Git add --patch'
+      return 'tab Git add --patch'
     elseif empty(info.paths) && info.section ==# 'Untracked'
-      return 'Git add --interactive'
+      return 'tab Git add --interactive'
     elseif empty(info.paths)
       continue
     endif
@@ -4449,10 +5106,10 @@ function! s:StagePatch(lnum1,lnum2) abort
       call s:TreeChomp(['add', '--intent-to-add', '--'] + intend)
     endif
     if !empty(add)
-      execute "Git add --patch -- ".join(map(add,'s:fnameescape(v:val)'))
+      execute "tab Git add --patch -- ".join(map(add,'fnameescape(v:val)'))
     endif
     if !empty(reset)
-      execute "Git reset --patch -- ".join(map(reset,'s:fnameescape(v:val)'))
+      execute "tab Git reset --patch -- ".join(map(reset,'fnameescape(v:val)'))
     endif
   catch /^fugitive:/
     return 'echoerr ' . string(v:exception)
@@ -4463,7 +5120,7 @@ endfunction
 " Section: :Git commit, :Git revert
 
 function! s:CommitInteractive(line1, line2, range, bang, mods, options, patch) abort
-  let status = s:StatusCommand(a:line1, a:line2, a:range, a:line2, a:bang, a:mods, '', '', [], a:options.dir)
+  let status = s:StatusCommand(a:line1, a:line2, a:range, get(a:options, 'curwin') && a:line2 < 0 ? 0 : a:line2, a:bang, a:mods, '', '', [], a:options)
   let status = len(status) ? status . '|' : ''
   if a:patch
     return status . 'if search("^Unstaged")|exe "normal >"|exe "+"|endif'
@@ -4533,12 +5190,11 @@ function! fugitive#PullComplete(A, L, P, ...) abort
 endfunction
 
 function! s:MergeSubcommand(line1, line2, range, bang, mods, options) abort
-  let dir = a:options.dir
   if empty(a:options.subcommand_args) && (
-        \ filereadable(fugitive#Find('.git/MERGE_MSG', dir)) ||
-        \ isdirectory(fugitive#Find('.git/rebase-apply', dir)) ||
-        \  !empty(s:TreeChomp(dir, 'diff-files', '--diff-filter=U')))
-    return 'echoerr ":Git merge for loading conflicts hase been removed in favor of :Git mergetool"'
+        \ filereadable(fugitive#Find('.git/MERGE_MSG', a:options)) ||
+        \ isdirectory(fugitive#Find('.git/rebase-apply', a:options)) ||
+        \  !empty(s:TreeChomp([a:options.git_dir, 'diff-files', '--diff-filter=U'])))
+    return 'echoerr ":Git merge for loading conflicts has been removed in favor of :Git mergetool"'
   endif
   return {}
 endfunction
@@ -4571,7 +5227,6 @@ function! s:ToolItems(state, from, to, offsets, text, ...) abort
     endif
     call add(items, item)
   endfor
-  let diff = items[0:-2]
   let items[-1].context = {'diff': items[0:-2]}
   return [items[-1]]
 endfunction
@@ -4665,19 +5320,20 @@ function! s:ToolStream(line1, line2, range, bang, mods, options, args, state) ab
     endif
     let i += 1
   endwhile
+  call fugitive#Autowrite()
   let a:state.mode = 'init'
   let a:state.from = ''
   let a:state.to = ''
-  let exec = s:UserCommandList({'git': a:options.git, 'dir': a:options.dir}) + ['-c', 'diff.context=0']
+  let exec = s:UserCommandList({'git': a:options.git, 'git_dir': a:options.git_dir}) + ['-c', 'diff.context=0']
   let exec += a:options.flags + ['--no-pager', 'diff', '--no-ext-diff', '--no-color', '--no-prefix'] + argv
   if prompt
     let title = ':Git ' . s:fnameescape(a:options.flags + [a:options.subcommand] + a:options.subcommand_args)
-    return s:QuickfixStream(a:line2, 'difftool', title, exec, !a:bang, a:mods, s:function('s:ToolParse'), a:state)
+    return s:QuickfixStream(get(a:options, 'curwin') && a:line2 < 0 ? 0 : a:line2, 'difftool', title, exec, !a:bang, a:mods, s:function('s:ToolParse'), a:state)
   else
     let filename = ''
     let cmd = []
     let tabnr = tabpagenr() + 1
-    for line in split(s:SystemError(exec)[0], "\n")
+    for line in s:SystemList(exec)[0]
       for item in s:ToolParse(a:state, line)
         if len(get(item, 'filename', '')) && item.filename != filename
           call add(cmd, 'tabedit ' . s:fnameescape(item.filename))
@@ -4694,7 +5350,7 @@ function! s:ToolStream(line1, line2, range, bang, mods, options, args, state) ab
 endfunction
 
 function! s:MergetoolSubcommand(line1, line2, range, bang, mods, options) abort
-  let dir = a:options.dir
+  let dir = a:options.git_dir
   exe s:DirCheck(dir)
   let i = 0
   let prompt = 1
@@ -4706,7 +5362,7 @@ function! s:MergetoolSubcommand(line1, line2, range, bang, mods, options) abort
 endfunction
 
 function! s:DifftoolSubcommand(line1, line2, range, bang, mods, options) abort
-  let dir = a:options.dir
+  let dir = s:Dir(a:options)
   exe s:DirCheck(dir)
   let i = 0
   let argv = copy(a:options.subcommand_args)
@@ -4803,16 +5459,19 @@ function! fugitive#LogComplete(A, L, P) abort
   return s:CompleteSub('log', a:A, a:L, a:P)
 endfunction
 
-function! s:GrepParseLine(prefix, name_only, dir, line) abort
+function! s:GrepParseLine(options, quiet, dir, line) abort
+  if !a:quiet
+    echo a:line
+  endif
   let entry = {'valid': 1}
-  let match = matchlist(a:line, '^\(.\{-\}\):\(\d\+\):\(\d\+:\)\=\(.*\)$')
-  if len(match)
+  let match = matchlist(a:line, '^\(.\{-\}\):\([1-9]\d*\):\([1-9]\d*:\)\=\(.*\)$')
+  if a:line =~# '^git: \|^usage: \|^error: \|^fatal: \|^BUG: '
+    return {'text': a:line}
+  elseif len(match)
     let entry.module = match[1]
     let entry.lnum = +match[2]
     let entry.col = +match[3]
     let entry.text = match[4]
-  elseif a:line =~# '^git: \|^usage: \|^error: \|^fatal: '
-    return {'text': a:line}
   else
     let entry.module = matchstr(a:line, '\CBinary file \zs.*\ze matches$')
     if len(entry.module)
@@ -4820,64 +5479,177 @@ function! s:GrepParseLine(prefix, name_only, dir, line) abort
       let entry.valid = 0
     endif
   endif
-  if empty(entry.module) && a:name_only
+  if empty(entry.module) && !a:options.line_number
+    let match = matchlist(a:line, '^\(.\{-\}\):\(.*\)$')
+    if len(match)
+      let entry.module = match[1]
+      let entry.pattern = '\M^' . escape(match[2], '\.^$/') . '$'
+    endif
+  endif
+  if empty(entry.module) && a:options.name_count && a:line =~# ':\d\+$'
+    let entry.text = matchstr(a:line, '\d\+$')
+    let entry.module = strpart(a:line, 0, len(a:line) - len(entry.text) - 1)
+  endif
+  if empty(entry.module) && a:options.name_only
     let entry.module = a:line
   endif
   if empty(entry.module)
     return {'text': a:line}
   endif
   if entry.module !~# ':'
-    let entry.filename = a:prefix . entry.module
+    let entry.filename = a:options.prefix . entry.module
   else
     let entry.filename = fugitive#Find(entry.module, a:dir)
   endif
   return entry
 endfunction
 
-function! s:GrepSubcommand(line1, line2, range, bang, mods, options) abort
-  let dir = a:options.dir
-  exe s:DirCheck(dir)
-  let listnr = a:line1 == 0 ? a:line1 : a:line2
-  let cmd = ['--no-pager', 'grep', '-n', '--no-color', '--full-name']
-  let tree = s:Tree(dir)
-  let args = a:options.subcommand_args
-  if get(args, 0, '') =~# '^\%(-O\|--open-files-in-pager\)$'
-    let args = args[1:-1]
+let s:grep_combine_flags = '[aiIrhHEGPFnlLzocpWq]\{-\}'
+function! s:GrepOptions(args, dir) abort
+  let options = {'name_only': 0, 'name_count': 0, 'line_number': 0}
+  let tree = s:Tree(a:dir)
+  let prefix = empty(tree) ? fugitive#Find(':0:', a:dir) :
+        \ s:cpath(getcwd(), tree) ? '' : FugitiveVimPath(tree . '/')
+  let options.prefix = prefix
+  for arg in a:args
+    if arg ==# '--'
+      break
+    endif
+    if arg =~# '^\%(-' . s:grep_combine_flags . 'c\|--count\)$'
+      let options.name_count = 1
+    endif
+    if arg =~# '^\%(-' . s:grep_combine_flags . 'n\|--line-number\)$'
+      let options.line_number = 1
+    elseif arg =~# '^\%(--no-line-number\)$'
+      let options.line_number = 0
+    endif
+    if arg =~# '^\%(-' . s:grep_combine_flags . '[lL]\|--files-with-matches\|--name-only\|--files-without-match\)$'
+      let options.name_only = 1
+    endif
+    if arg ==# '--cached'
+      let options.prefix = fugitive#Find(':0:', a:dir)
+    elseif arg ==# '--no-cached'
+      let options.prefix = prefix
+    endif
+  endfor
+  return options
+endfunction
+
+function! s:GrepCfile(result) abort
+  let options = s:GrepOptions(a:result.args, a:result)
+  let entry = s:GrepParseLine(options, 1, a:result, getline('.'))
+  if get(entry, 'col')
+    return [entry.filename, entry.lnum, "norm!" . entry.col . "|"]
+  elseif has_key(entry, 'lnum')
+    return [entry.filename, entry.lnum]
+  elseif has_key(entry, 'pattern')
+    return [entry.filename, '', 'silent /' . entry.pattern]
+  elseif has_key(entry, 'filename')
+    return [entry.filename]
+  else
+    return []
   endif
-  let name_only = s:HasOpt(args, '-l', '--files-with-matches', '--name-only', '-L', '--files-without-match')
+endfunction
+
+function! s:GrepSubcommand(line1, line2, range, bang, mods, options) abort
+  let args = copy(a:options.subcommand_args)
+  let handle = -1
+  let quiet = 0
+  let i = 0
+  while i < len(args) && args[i] !=# '--'
+    let partition = matchstr(args[i], '^-' . s:grep_combine_flags . '\ze[qzO]')
+    if len(partition) > 1
+      call insert(args, '-' . strpart(args[i], len(partition)), i+1)
+      let args[i] = partition
+    elseif args[i] =~# '^\%(-' . s:grep_combine_flags . '[eABC]\|--max-depth\|--context\|--after-context\|--before-context\|--threads\)$'
+      let i += 1
+    elseif args[i] =~# '^\%(-O\|--open-files-in-pager\)$'
+      let handle = 1
+      call remove(args, i)
+      continue
+    elseif args[i] =~# '^\%(-O\|--open-files-in-pager=\)'
+      let handle = 0
+    elseif args[i] =~# '^-[qz].'
+      let args[i] = '-' . args[i][2:-1]
+      let quiet = 1
+    elseif args[i] =~# '^\%(-[qz]\|--quiet\)$'
+      let quiet = 1
+      call remove(args, i)
+      continue
+    elseif args[i] =~# '^--no-quiet$'
+      let quiet = 0
+    elseif args[i] =~# '^\%(--heading\)$'
+      call remove(args, i)
+      continue
+    endif
+    let i += 1
+  endwhile
+  if handle < 0 ? !quiet : !handle
+    return {}
+  endif
+  call fugitive#Autowrite()
+  let listnr = get(a:options, 'curwin') && a:line2 < 0 ? 0 : a:line2
+  if s:HasOpt(args, '--no-line-number')
+    let lc = []
+  else
+    let lc = fugitive#GitVersion(2, 19) ? ['-n', '--column'] : ['-n']
+  endif
+  let cmd = ['grep', '--no-color', '--full-name'] + lc
+  let dir = s:Dir(a:options)
+  let options = s:GrepOptions(lc + args, dir)
   if listnr > 0
     exe listnr 'wincmd w'
   else
     call s:BlurStatus()
   endif
-  redraw
-  call s:QuickfixCreate(listnr, {'title': (listnr < 0 ? ':Git grep ' : ':0Git grep ') . s:fnameescape(args)})
+  let title = (listnr < 0 ? ':Ggrep ' : ':Glgrep ') . s:fnameescape(args)
+  call s:QuickfixCreate(listnr, {'title': title})
   let tempfile = tempname()
+  let state = {
+        \ 'git': a:options.git,
+        \ 'flags': a:options.flags,
+        \ 'args': cmd + args,
+        \ 'dir': s:GitDir(a:options),
+        \ 'git_dir': s:GitDir(a:options),
+        \ 'cwd': s:UserCommandCwd(a:options),
+        \ 'filetype': 'git',
+        \ 'mods': s:Mods(a:mods),
+        \ 'file': s:Resolve(tempfile)}
   let event = listnr < 0 ? 'grep-fugitive' : 'lgrep-fugitive'
   silent exe s:DoAutocmd('QuickFixCmdPre ' . event)
-  let prefix = FugitiveVimPath(s:HasOpt(args, '--cached') || empty(tree) ?
-        \ 'fugitive://' . dir . '//0/' :
-        \ s:cpath(getcwd(), tree) ? '' : tree . '/')
   try
-    if exists('+guioptions') && &guioptions =~# '!'
-      let guioptions = &guioptions
-      set guioptions-=!
+    if !quiet && &more
+      let more = 1
+      set nomore
+    endif
+    if !quiet
+      echo title
+    endif
+    let list = s:SystemList(s:UserCommandList(a:options) + cmd + args)[0]
+    call writefile(list + [''], tempfile, 'b')
+    call s:RunSave(state)
+    call map(list, 's:GrepParseLine(options, ' . quiet . ', dir, v:val)')
+    call s:QuickfixSet(listnr, list, 'a')
+    let press_enter_shortfall = &cmdheight - len(list)
+    if press_enter_shortfall > 0 && !quiet
+      echo repeat("\n", press_enter_shortfall - 1)
     endif
-    exe '!' . escape(s:UserCommand(a:options, cmd + args), '%#!')
-          \ printf(&shellpipe . (&shellpipe =~# '%s' ? '' : ' %s'), s:shellesc(tempfile))
   finally
-    if exists('guioptions')
-      let &guioptions = guioptions
+    if exists('l:more')
+      let &more = more
     endif
   endtry
-  let list = map(readfile(tempfile), 's:GrepParseLine(prefix, name_only, dir, v:val)')
-  call s:QuickfixSet(listnr, list, 'a')
+  call s:RunFinished(state)
   silent exe s:DoAutocmd('QuickFixCmdPost ' . event)
-  if !has('gui_running')
-    redraw
-  endif
+  if quiet
+    let bufnr = bufnr('')
+    exe s:QuickfixOpen(listnr, a:mods)
+    if bufnr != bufnr('') && !a:bang
+      wincmd p
+    endif
+  end
   if !a:bang && !empty(list)
-    return (listnr < 0 ? 'c' : 'l').'first'
+    return 'silent ' . (listnr < 0 ? 'c' : 'l').'first'
   else
     return ''
   endif
@@ -4885,7 +5657,7 @@ endfunction
 
 function! fugitive#GrepCommand(line1, line2, range, bang, mods, arg) abort
   return fugitive#Command(a:line1, a:line2, a:range, a:bang, a:mods,
-        \ "grep -O " . (fugitive#GitVersion(2, 19) ? "--column " : "") . a:arg)
+        \ "grep -O " . a:arg)
 endfunction
 
 let s:log_diff_context = '{"filename": fugitive#Find(v:val . from, a:dir), "lnum": get(offsets, v:key), "module": strpart(v:val, 0, len(a:state.base_module)) . from}'
@@ -4905,7 +5677,7 @@ function! s:LogFlushQueue(state, dir) abort
   return queue
 endfunction
 
-function! s:LogParse(state, dir, line) abort
+function! s:LogParse(state, dir, prefix, line) abort
   if a:state.mode ==# 'hunk' && a:line =~# '^[-+ ]'
     return []
   endif
@@ -4913,7 +5685,7 @@ function! s:LogParse(state, dir, line) abort
   if len(list)
     let queue = s:LogFlushQueue(a:state, a:dir)
     let a:state.mode = 'commit'
-    let a:state.base = 'fugitive://' . a:dir . '//' . list[2]
+    let a:state.base = a:prefix . list[2]
     if len(list[1])
       let [a:state.base_module; a:state.parents] = split(list[1], ' ')
     else
@@ -5058,7 +5830,7 @@ function! fugitive#LogCommand(line1, count, range, bang, mods, args, type) abort
         \ args + extra_args + paths + extra_paths)
   let state.target = path
   let title = titlepre . (listnr < 0 ? 'Gclog ' : 'Gllog ') . s:fnameescape(args + paths)
-  return s:QuickfixStream(listnr, 'log', title, s:UserCommandList(dir) + cmd, !a:bang, a:mods, s:function('s:LogParse'), state, dir) . after
+  return s:QuickfixStream(listnr, 'log', title, s:UserCommandList(dir) + cmd, !a:bang, a:mods, s:function('s:LogParse'), state, dir, s:DirUrlPrefix(dir)) . after
 endfunction
 
 " Section: :Gedit, :Gpedit, :Gsplit, :Gvsplit, :Gtabedit, :Gread
@@ -5095,7 +5867,7 @@ function! s:OpenParse(string, wants_cmd) abort
       break
     endif
   endwhile
-  if len(args)
+  if len(args) && args !=# ['>:']
     let file = join(args)
     if file ==# '-'
       let result = fugitive#Result()
@@ -5191,7 +5963,7 @@ function! s:BlurStatus() abort
 endfunction
 
 let s:bang_edits = {'split': 'Git', 'vsplit': 'vertical Git', 'tabedit': 'tab Git', 'pedit': 'Git!'}
-function! fugitive#Open(cmd, bang, mods, arg, args) abort
+function! fugitive#Open(cmd, bang, mods, arg, ...) abort
   exe s:VersionCheck()
   if a:bang
     return 'echoerr ' . string(':G' . a:cmd . '! for temp buffer output has been replaced by :' . get(s:bang_edits, a:cmd, 'Git') . ' --paginate')
@@ -5228,19 +6000,10 @@ function! s:ReadPrepare(line1, count, range, mods) abort
   else
     let pre = ''
   endif
-  return [pre . 'keepalt ' . mods . after . 'read', delete . 'diffupdate' . (a:count < 0 ? '|' . line('.') : '')]
+  return [pre . 'keepalt ' . mods . after . 'read', '|' . delete . 'diffupdate' . (a:count < 0 ? '|' . line('.') : '')]
 endfunction
 
-function! s:ReadExec(line1, count, range, mods, env, args, options) abort
-  let [read, post] = s:ReadPrepare(a:line1, a:count, a:range, a:mods)
-  let env = s:BuildEnvPrefix(extend({'COLUMNS': &tw ? &tw : 80}, a:env))
-  silent execute read . '!' escape(env . s:UserCommand(a:options, ['--no-pager'] + a:args), '!#%')
-  execute post
-  call fugitive#ReloadStatus(a:options.dir, 1)
-  return 'redraw|echo '.string(':!'.s:UserCommand(a:options, a:args))
-endfunction
-
-function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, args) abort
+function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, ...) abort
   exe s:VersionCheck()
   if a:bang
     return 'echoerr ' . string(':Gread! for temp buffer output has been replaced by :{range}Git! --paginate')
@@ -5254,7 +6017,7 @@ function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, args) abort
   if file =~# '^fugitive:' && a:count is# 0
     return 'exe ' .string('keepalt ' . s:Mods(a:mods) . fugitive#FileReadCmd(file, 0, pre)) . '|diffupdate'
   endif
-  return read . ' ' . pre . ' ' . s:fnameescape(file) . '|' . post
+  return read . ' ' . pre . ' ' . s:fnameescape(file) . post
 endfunction
 
 function! fugitive#EditComplete(A, L, P) abort
@@ -5275,7 +6038,7 @@ endfunction
 
 " Section: :Gwrite, :Gwq
 
-function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, args) abort
+function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, ...) abort
   exe s:VersionCheck()
   if s:cpath(expand('%:p'), fugitive#Find('.git/COMMIT_EDITMSG')) && empty(a:arg)
     return (empty($GIT_INDEX_FILE) ? 'write|bdelete' : 'wq') . (a:bang ? '!' : '')
@@ -5352,13 +6115,9 @@ function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, args) abor
     execute 'write! '.s:fnameescape(file)
   endif
 
-  if a:bang
-    let [error, exec_error] = s:ChompError(['add', '--force', '--', file])
-  else
-    let [error, exec_error] = s:ChompError(['add', '--', file])
-  endif
-  if exec_error
-    let v:errmsg = 'fugitive: '.error
+  let message = s:ChompStderr(['add'] + (a:bang ? ['--force'] : []) + ['--', file])
+  if len(message)
+    let v:errmsg = 'fugitive: '.message
     return 'echoerr v:errmsg'
   endif
   if s:cpath(fugitive#Real(@%), file) && s:DirCommitFile(@%)[1] =~# '^\d$'
@@ -5406,7 +6165,7 @@ function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, args) abor
       endif
     endfor
   endfor
-  call fugitive#ReloadStatus(-1, 1)
+  call fugitive#DidChange()
   return 'silent checktime' . after
 endfunction
 
@@ -5425,14 +6184,38 @@ endfunction
 
 " Section: :Git push, :Git fetch
 
+function! s:CompletePush(A, L, P, ...) abort
+  let dir = a:0 ? a:1 : s:Dir()
+  let remote = matchstr(a:L, '\u\w*[! ] *.\{-\}\s\@<=\zs[^-[:space:]]\S*\ze ')
+  if empty(remote)
+    let matches = s:LinesError([dir, 'remote'])[0]
+  elseif a:A =~# ':'
+    let lead = matchstr(a:A, '^[^:]*:')
+    let matches = s:LinesError([dir, 'ls-remote', remote])[0]
+    call filter(matches, 'v:val =~# "\t" && v:val !~# "{"')
+    call map(matches, 'lead . s:sub(v:val, "^.*\t", "")')
+  else
+    let matches = s:CompleteHeads(dir)
+  endif
+  return s:FilterEscape(matches, a:A)
+endfunction
+
 function! fugitive#PushComplete(A, L, P, ...) abort
-  return s:CompleteSub('push', a:A, a:L, a:P, function('s:CompleteRemote'), a:000)
+  return s:CompleteSub('push', a:A, a:L, a:P, function('s:CompletePush'), a:000)
 endfunction
 
 function! fugitive#FetchComplete(A, L, P, ...) abort
   return s:CompleteSub('fetch', a:A, a:L, a:P, function('s:CompleteRemote'), a:000)
 endfunction
 
+function! s:PushSubcommand(...) abort
+  return {'no_more': 1}
+endfunction
+
+function! s:FetchSubcommand(...) abort
+  return {'no_more': 1}
+endfunction
+
 " Section: :Gdiff
 
 augroup fugitive_diff
@@ -5456,12 +6239,14 @@ function! fugitive#CanDiffoff(buf) abort
   return s:can_diffoff(bufnr(a:buf))
 endfunction
 
-function! s:diff_modifier(count) abort
+function! s:DiffModifier(count, default) abort
   let fdc = matchstr(&diffopt, 'foldcolumn:\zs\d\+')
   if &diffopt =~# 'horizontal' && &diffopt !~# 'vertical'
     return ''
   elseif &diffopt =~# 'vertical'
     return 'vertical '
+  elseif !get(g:, 'fugitive_diffsplit_directional_fit', a:default)
+    return ''
   elseif winwidth(0) <= a:count * ((&tw ? &tw : 80) + (empty(fdc) ? 2 : fdc))
     return ''
   else
@@ -5526,36 +6311,23 @@ function! s:diffoff_all(dir) abort
   diffoff!
 endfunction
 
-function! s:CompareAge(mine, theirs) abort
-  let scores = {':0': 1, ':1': 2, ':2': 3, ':': 4, ':3': 5}
-  let mine = substitute(a:mine, '^:', '', '')
-  let theirs = substitute(a:theirs, '^:', '', '')
-  let my_score    = get(scores, ':'.mine, 0)
-  let their_score = get(scores, ':'.theirs, 0)
-  if my_score || their_score
-    return my_score < their_score ? -1 : my_score != their_score
-  elseif mine ==# theirs
-    return 0
-  endif
-  let base = s:TreeChomp('merge-base', mine, theirs)
-  if base ==# mine
-    return -1
-  elseif base ==# theirs
-    return 1
-  endif
-  let my_time    = +s:TreeChomp('log', '--max-count=1', '--pretty=format:%at', a:mine, '--')
-  let their_time = +s:TreeChomp('log', '--max-count=1', '--pretty=format:%at', a:theirs, '--')
-  return my_time < their_time ? -1 : my_time != their_time
-endfunction
-
 function! s:IsConflicted() abort
-  return len(@%) && !empty(s:ChompDefault('', 'ls-files', '--unmerged', '--', expand('%:p')))
+  return len(@%) && !empty(s:ChompDefault('', ['ls-files', '--unmerged', '--', expand('%:p')]))
 endfunction
 
-function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
+function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, ...) abort
   exe s:VersionCheck()
   let args = s:ArgSplit(a:arg)
   let post = ''
+  let autodir = a:autodir
+  while get(args, 0, '') =~# '^++'
+    if args[0] =~? '^++novertical$'
+      let autodir = 0
+    else
+      return 'echoerr ' . string('fugitive: unknown option ' . args[0])
+    endif
+    call remove(args, 0)
+  endwhile
   if get(args, 0) =~# '^+'
     let post = remove(args, 0)[1:-1]
   endif
@@ -5571,7 +6343,7 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
     let pre = ''
   endif
   let back = exists('*win_getid') ? 'call win_gotoid(' . win_getid() . ')' : 'wincmd p'
-  if (empty(args) || args[0] ==# ':') && a:keepfocus
+  if (empty(args) || args[0] =~# '^>\=:$') && a:keepfocus
     exe s:DirCheck()
     if commit =~# '^1\=$' && s:IsConflicted()
       let parents = [s:Relative(':2:'), s:Relative(':3:')]
@@ -5587,7 +6359,7 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
   try
     if exists('parents') && len(parents) > 1
       exe pre
-      let mods = (a:autodir ? s:diff_modifier(len(parents) + 1) : '') . s:Mods(mods, 'leftabove')
+      let mods = (autodir ? s:DiffModifier(len(parents) + 1, empty(args) || args[0] =~# '^>') : '') . s:Mods(mods, 'leftabove')
       let nr = bufnr('')
       if len(parents) > 1 && !&equalalways
         let equalalways = 0
@@ -5619,7 +6391,7 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
         let file = s:Relative()
       elseif arg ==# ':'
         exe s:DirCheck()
-        let file = s:Relative(':0:')
+        let file = len(commit) ? s:Relative() : s:Relative(s:IsConflicted() ? ':1:' : ':0:')
       elseif arg =~# '^:\d$'
         exe s:DirCheck()
         let file = s:Relative(arg . ':')
@@ -5632,16 +6404,27 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
           return 'echoerr ' . string(v:exception)
         endtry
       endif
-    elseif exists('parents') && len(parents)
-      let file = parents[-1]
+      if a:keepfocus || arg =~# '^>'
+        let mods = s:Mods(a:mods, 'leftabove')
+      else
+        let mods = s:Mods(a:mods)
+      endif
+    elseif exists('parents')
+      let file = get(parents, -1, s:Relative(repeat('0', 40). ':'))
+      let mods = s:Mods(a:mods, 'leftabove')
     elseif len(commit)
       let file = s:Relative()
+      let mods = s:Mods(a:mods, 'rightbelow')
     elseif s:IsConflicted()
       let file = s:Relative(':1:')
-      let post = 'echohl WarningMsg|echo "Use :Gdiffsplit! for 3 way diff"|echohl NONE|' . post
+      let mods = s:Mods(a:mods, 'leftabove')
+      if get(g:, 'fugitive_legacy_commands', 1)
+        let post = 'echohl WarningMsg|echo "Use :Gdiffsplit! for 3 way diff"|echohl NONE|' . post
+      endif
     else
       exe s:DirCheck()
       let file = s:Relative(':0:')
+      let mods = s:Mods(a:mods, 'leftabove')
     endif
     let spec = s:Generate(file)
     if spec =~# '^fugitive:' && empty(s:DirCommitFile(spec)[2])
@@ -5650,12 +6433,7 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
     exe pre
     let restore = s:diff_restore()
     let w:fugitive_diff_restore = restore
-    if len(spec) && s:CompareAge(commit, s:DirCommitFile(spec)[1]) < 0
-      let mods = s:Mods(mods, 'rightbelow')
-    else
-      let mods = s:Mods(mods, 'leftabove')
-    endif
-    let mods = (a:autodir ? s:diff_modifier(2) : '') . mods
+    let mods = (autodir ? s:DiffModifier(2, empty(args) || args[0] =~# '^>') : '') . mods
     if &diffopt =~# 'vertical'
       let diffopt = &diffopt
       set diffopt-=vertical
@@ -5689,34 +6467,45 @@ function! s:Move(force, rename, destination) abort
   if s:DirCommitFile(@%)[1] !~# '^0\=$' || empty(@%)
     return 'echoerr ' . string('fugitive: mv not supported for this buffer')
   endif
-  if a:destination =~# '^\a\+:\|^/'
-    let destination = a:destination
-  elseif a:destination =~# '^:/:\='
-    let destination = s:Tree(dir) . substitute(a:destination, '^:/:\=', '', '')
-  elseif a:destination =~# '^:(\%(top\|top,literal\|literal,top\))'
-    let destination = s:Tree(dir) . matchstr(a:destination, ')\zs.*')
-  elseif a:destination =~# '^:(literal)'
-    let destination = simplify(getcwd() . '/' . matchstr(a:destination, ')\zs.*'))
-  elseif a:rename
-    let destination = simplify(expand('%:p:s?[\/]$??:h') . '/' . a:destination)
-  elseif a:destination =~# '^\.\.\=\%(/\|$\)'
-    let destination = simplify(getcwd() . '/' . a:destination)
+  if a:rename
+    let default_root = expand('%:p:s?[\/]$??:h') . '/'
   else
-    let destination = s:Tree(dir) . '/' . a:destination
+    let default_root = s:Tree(dir) . '/'
+  endif
+  if a:destination =~# '^:/:\='
+    let destination = s:Tree(dir) . s:Expand(substitute(a:destination, '^:/:\=', '', ''))
+  elseif a:destination =~# '^:(top)'
+    let destination = s:Expand(matchstr(a:destination, ')\zs.*'))
+    if destination !~# '^/\|^\a\+:'
+      let destination = s:Tree(dir) . '/' . destination
+    endif
+    let destination = s:Tree(dir) .
+  elseif a:destination =~# '^:(\%(top,literal\|literal,top\))'
+    let destination = s:Tree(dir) . matchstr(a:destination, ')\zs.*')
+  elseif a:destination =~# '^:(literal)\.\.\=\%(/\|$\)'
+    let destination = simplify(getcwd() . '/' . matchstr(a:destination, ')\zs.*'))
+  elseif a:destination =~# '^:(literal)'
+    let destination = simplify(default_root . matchstr(a:destination, ')\zs.*'))
+  else
+    let destination = s:Expand(a:destination)
+    if destination =~# '^\.\.\=\%(/\|$\)'
+      let destination = simplify(getcwd() . '/' . destination)
+    elseif destination !~# '^\a\+:\|^/'
+      let destination = default_root . destination
+    endif
   endif
   let destination = s:Slash(destination)
   if isdirectory(@%)
     setlocal noswapfile
   endif
-  let [message, exec_error] = s:ChompError(['mv'] + (a:force ? ['-f'] : []) + ['--', expand('%:p'), destination], dir)
-  if exec_error
-    let v:errmsg = 'fugitive: '.message
-    return 'echoerr v:errmsg'
+  let exec = fugitive#Execute(['mv'] + (a:force ? ['-f'] : []) + ['--', expand('%:p'), destination], dir)
+  if exec.exit_status && exec.stderr !=# ['']
+    return 'echoerr ' .string('fugitive: '.s:JoinChomp(exec.stderr))
   endif
   if isdirectory(destination)
     let destination = fnamemodify(s:sub(destination,'/$','').'/'.expand('%:t'),':.')
   endif
-  let reload = '|call fugitive#ReloadStatus(' . string(dir) . ', 1)'
+  let reload = '|call fugitive#DidChange(' . string(exec) . ')'
   if empty(s:DirCommitFile(@%)[1])
     if isdirectory(destination)
       return 'keepalt edit '.s:fnameescape(destination) . reload
@@ -5737,11 +6526,11 @@ function! fugitive#RenameComplete(A,L,P) abort
   endif
 endfunction
 
-function! fugitive#MoveCommand(line1, line2, range, bang, mods, arg, args) abort
+function! fugitive#MoveCommand(line1, line2, range, bang, mods, arg, ...) abort
   return s:Move(a:bang, 0, a:arg)
 endfunction
 
-function! fugitive#RenameCommand(line1, line2, range, bang, mods, arg, args) abort
+function! fugitive#RenameCommand(line1, line2, range, bang, mods, arg, ...) abort
   return s:Move(a:bang, 1, a:arg)
 endfunction
 
@@ -5758,20 +6547,20 @@ function! s:Remove(after, force) abort
   if a:force
     let cmd += ['--force']
   endif
-  let [message, exec_error] = s:ChompError(cmd + ['--', expand('%:p')], dir)
-  if exec_error
+  let message = s:ChompStderr(cmd + ['--', expand('%:p')], dir)
+  if len(message)
     let v:errmsg = 'fugitive: '.s:sub(message,'error:.*\zs\n\(.*-f.*',' (add ! to force)')
     return 'echoerr '.string(v:errmsg)
   else
-    return a:after . (a:force ? '!' : ''). '|call fugitive#ReloadStatus(' . string(dir) . ', 1)'
+    return a:after . (a:force ? '!' : ''). '|call fugitive#DidChange(' . string(dir) . ')'
   endif
 endfunction
 
-function! fugitive#RemoveCommand(line1, line2, range, bang, mods, arg, args) abort
+function! fugitive#RemoveCommand(line1, line2, range, bang, mods, arg, ...) abort
   return s:Remove('edit', a:bang)
 endfunction
 
-function! fugitive#DeleteCommand(line1, line2, range, bang, mods, arg, args) abort
+function! fugitive#DeleteCommand(line1, line2, range, bang, mods, arg, ...) abort
   return s:Remove('bdelete', a:bang)
 endfunction
 
@@ -5815,7 +6604,7 @@ function! s:BlameCommitFileLnum(...) abort
   if commit =~# '^0\+$'
     let commit = ''
   elseif has_key(state, 'blame_reverse_end')
-    let commit = get(s:LinesError(state.dir, 'rev-list', '--ancestry-path', '--reverse', commit . '..' . state.blame_reverse_end)[0], 0, '')
+    let commit = get(s:LinesError([state.git_dir, 'rev-list', '--ancestry-path', '--reverse', commit . '..' . state.blame_reverse_end])[0], 0, '')
   endif
   let lnum = +matchstr(line, ' \zs\d\+\ze \%((\| *\d\+)\)')
   let path = matchstr(line, '^\^\=[?*]*\x* \+\%(\d\+ \+\d\+ \+\)\=\zs.\{-\}\ze\s*\d\+ \%((\| *\d\+)\)')
@@ -5851,7 +6640,7 @@ function! fugitive#BlameComplete(A, L, P) abort
 endfunction
 
 function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
-  let dir = s:Dir()
+  let dir = s:Dir(a:options)
   exe s:DirCheck(dir)
   let flags = copy(a:options.subcommand_args)
   let i = 0
@@ -5888,7 +6677,7 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
       let i += 1
       if i == len(flags)
         echohl ErrorMsg
-        echo s:ChompError([dir, 'blame', arg])[0]
+        echo s:ChompStderr([dir, 'blame', arg])
         echohl NONE
         return ''
       endif
@@ -5942,9 +6731,11 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
       let cmd += ['--contents', tempname . '.in']
       silent execute 'noautocmd keepalt %write ' . s:fnameescape(tempname . '.in')
       let delete_in = 1
+    else
+      call fugitive#Autowrite()
     endif
-    let basecmd = [{'git': a:options.git, 'dir': dir}] + ['--literal-pathspecs'] + cmd + ['--'] + (len(files) ? files : [file])
-    let [err, exec_error] = s:TempCmd(temp, basecmd)
+    let basecmd = [{'git': a:options.git, 'git_dir': dir}] + ['--literal-pathspecs'] + cmd + ['--'] + (len(files) ? files : [file])
+    let [err, exec_error] = s:StdoutToFile(temp, basecmd)
     if exists('delete_in')
       call delete(tempname . '.in')
     endif
@@ -5984,18 +6775,27 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
       if s:HasOpt(flags, '--reverse')
         let temp_state.blame_reverse_end = matchstr(get(commits, 0, ''), '\.\.\zs.*')
       endif
-      if (a:line1 == 0 || a:range == 1) && a:count > 0
-        let edit = s:Mods(a:mods) . get(['edit', 'split', 'pedit', 'vsplit', 'tabedit'], a:count - (a:line1 ? a:line1 : 1), 'split')
+      if a:line1 == 0 && a:count == 1
+        if get(a:options, 'curwin')
+          let edit = 'edit'
+        elseif a:bang
+          let edit = 'pedit'
+        else
+          let edit = 'split'
+        endif
+        return s:BlameCommit(s:Mods(a:mods) . edit, get(readfile(temp), 0, ''), temp_state)
+      elseif (a:line1 == 0 || a:range == 1) && a:count > 0
+        let edit = s:Mods(a:mods) . get(['edit', 'split', 'pedit', 'vsplit', 'tabedit', 'edit'], a:count - (a:line1 ? a:line1 : 1), 'split')
         return s:BlameCommit(edit, get(readfile(temp), 0, ''), temp_state)
       else
         let temp = s:Resolve(temp)
         let temp_state.file = temp
         call s:RunSave(temp_state)
         if len(ranges + commits + files) || raw
-          let reload = '|call fugitive#ReloadStatus(fugitive#Result(' . string(temp_state.file) . '), 1)'
+          let reload = '|call fugitive#DidChange(fugitive#Result(' . string(temp_state.file) . '))'
           let mods = s:Mods(a:mods)
           if a:count != 0
-            exe 'silent keepalt' mods 'split' s:fnameescape(temp)
+            exe 'silent keepalt' mods get(a:options, 'curwin') ? 'edit' : 'split' s:fnameescape(temp)
           elseif !&modified || a:bang || &bufhidden ==# 'hide' || (empty(&bufhidden) && &hidden)
             exe 'silent' mods 'edit' . (a:bang ? '! ' : ' ') . s:fnameescape(temp)
           else
@@ -6275,8 +7075,8 @@ function! fugitive#BlameFileType() abort
   endif
   call s:Map('n', '<F1>', ':help :Git_blame<CR>', '<silent>')
   call s:Map('n', 'g?',   ':help :Git_blame<CR>', '<silent>')
-  if mapcheck('q', 'n') =~# '^$\|bdelete'
-    call s:Map('n', 'q',  ':echoerr "fugitive: q removed in favor of gq (or :q)"<CR>', '<silent>')
+  if empty(mapcheck('q', 'n'))
+    nnoremap <buffer> <silent> q :<C-U>echoerr "fugitive: q removed in favor of gq (or :q)"<CR>
   endif
   call s:Map('n', 'gq',   ':exe <SID>BlameQuit()<CR>', '<silent>')
   call s:Map('n', '<2-LeftMouse>', ':<C-U>exe <SID>BlameCommit("exe <SID>BlameLeave()<Bar>edit")<CR>', '<silent>')
@@ -6291,6 +7091,8 @@ function! fugitive#BlameFileType() abort
   call s:Map('n', 'O',    ':<C-U>exe <SID>BlameCommit("tabedit")<CR>', '<silent>')
   call s:Map('n', 'p',    ':<C-U>exe <SID>BlameCommit("pedit")<CR>', '<silent>')
   call s:Map('n', '.',    ":<C-U> <C-R>=substitute(<SID>BlameCommitFileLnum()[0],'^$','@','')<CR><Home>")
+  call s:Map('n', '(',    "-")
+  call s:Map('n', ')',    "+")
   call s:Map('n', 'A',    ":<C-u>exe 'vertical resize '.(<SID>linechars('.\\{-\\}\\ze [0-9:/+-][0-9:/+ -]* \\d\\+)')+1+v:count)<CR>", '<silent>')
   call s:Map('n', 'C',    ":<C-u>exe 'vertical resize '.(<SID>linechars('^\\S\\+')+1+v:count)<CR>", '<silent>')
   call s:Map('n', 'D',    ":<C-u>exe 'vertical resize '.(<SID>linechars('.\\{-\\}\\ze\\d\\ze\\s\\+\\d\\+)')+1-v:count)<CR>", '<silent>')
@@ -6330,16 +7132,16 @@ function! s:BrowserOpen(url, mods, echo_copy) abort
   endif
 endfunction
 
-function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abort
+function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, ...) abort
   exe s:VersionCheck()
   let dir = s:Dir()
   try
     let arg = a:arg
-    if arg =~# '^++remote='
-      let remote = matchstr(arg, '^++remote=\zs\S\+')
+    if arg =~# '^++\%([Gg]it\)\=[Rr]emote='
+      let remote = matchstr(arg, '^++\%([Gg]it\)\=[Rr]emote=\zs\S\+')
       let arg = matchstr(arg, '\s\zs\S.*')
     endif
-    let validremote = '\.\|\.\=/.*\|[[:alnum:]_-]\+\%(://.\{-\}\)\='
+    let validremote = '\.\%(git\)\=\|\.\=/.*\|[[:alnum:]_-]\+\%(://.\{-\}\)\='
     if arg ==# '-'
       let remote = ''
       let rev = ''
@@ -6371,12 +7173,10 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
       for line in readfile(result.file, '', 4096)
         let rev = s:fnameescape(matchstr(line, '\<https\=://[^[:space:]<>]*[^[:space:]<>.,;:"''!?]'))
         if len(rev)
-          break
+          return s:BrowserOpen(rev, a:mods, a:bang)
         endif
       endfor
-      if empty(rev)
-        return 'echoerr ' . string('fugitive: no URL found in output of :Git')
-      endif
+      return 'echoerr ' . string('fugitive: no URL found in output of :Git')
     endif
     exe s:DirCheck(dir)
     if empty(expanded)
@@ -6427,6 +7227,7 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
         let type = 'blob'
       endif
     endif
+    let config = fugitive#Config(dir)
     if type ==# 'tree' && !empty(path)
       let path = s:sub(path, '/\=$', '/')
     endif
@@ -6449,6 +7250,7 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
         let branch = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+')
       else
         let merge = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+')
+        let branch = merge
         let path = '.git/refs/heads/'.merge
       endif
     elseif path =~# '^\.git/refs/heads/.'
@@ -6457,13 +7259,13 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
       let branch = FugitiveHead(0, dir)
     endif
     if !empty(branch)
-      let r = FugitiveConfigGet('branch.'.branch.'.remote', dir)
-      let m = FugitiveConfigGet('branch.'.branch.'.merge', dir)[11:-1]
+      let r = FugitiveConfigGet('branch.'.branch.'.remote', config)
+      let m = FugitiveConfigGet('branch.'.branch.'.merge', config)[11:-1]
       if r ==# '.' && !empty(m)
-        let r2 = FugitiveConfigGet('branch.'.m.'.remote', dir)
+        let r2 = FugitiveConfigGet('branch.'.m.'.remote', config)
         if r2 !~# '^\.\=$'
           let r = r2
-          let m = FugitiveConfigGet('branch.'.m.'.merge', dir)[11:-1]
+          let m = FugitiveConfigGet('branch.'.m.'.merge', config)[11:-1]
         endif
       endif
       if empty(remote)
@@ -6471,8 +7273,8 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
       endif
       if r ==# '.' || r ==# remote
         let remote_ref = 'refs/remotes/' . remote . '/' . branch
-        if FugitiveConfigGet('push.default', dir) ==# 'upstream' ||
-              \ !filereadable(FugitiveFind('.git/' . remote_ref, dir)) && s:ChompError(['rev-parse', '--verify', remote_ref, '--'], dir)[1]
+        if FugitiveConfigGet('push.default', config) ==# 'upstream' ||
+              \ !filereadable(FugitiveFind('.git/' . remote_ref, dir)) && empty(s:ChompDefault('', ['rev-parse', '--verify', remote_ref, '--'], dir))
           let merge = m
           if path =~# '^\.git/refs/heads/.'
             let path = '.git/refs/heads/'.merge
@@ -6492,10 +7294,7 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
         let commit = ''
         if len(merge)
           let owner = s:Owner(@%, dir)
-          let [commit, exec_error] = s:ChompError(['merge-base', 'refs/remotes/' . remote . '/' . merge, empty(owner) ? '@' : owner, '--'], dir)
-          if exec_error
-            let commit = ''
-          endif
+          let commit = s:ChompDefault('', ['merge-base', 'refs/remotes/' . remote . '/' . merge, empty(owner) ? '@' : owner, '--'], dir)
           if line2 > 0 && empty(arg) && commit =~# '^\x\{40,\}$'
             let blame_list = tempname()
             call writefile([commit, ''], blame_list, 'b')
@@ -6508,7 +7307,7 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
                 let line1 = +matchstr(blame[0], blame_regex)
                 let line2 = +matchstr(blame[-1], blame_regex)
               else
-                call s:throw("Can't browse to uncommitted change")
+                throw "fugitive: can't browse to uncommitted change"
               endif
             endif
           endif
@@ -6529,20 +7328,22 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
       endwhile
     endif
 
-    if empty(remote)
-      let remote = '.'
+    if empty(remote) || remote ==# '.'
+      let remote = s:RemoteDefault(config)
     endif
-    let raw = fugitive#RemoteUrl(remote, dir)
-    if empty(raw)
-      let raw = remote
+    if remote =~# ':'
+      let remote_url = remote
+    else
+      let remote_url = fugitive#RemoteUrl(remote, config)
     endif
+    let raw = empty(remote_url) ? remote : remote_url
+    let git_dir = s:GitDir(dir)
 
     let opts = {
-          \ 'git_dir': dir,
-          \ 'dir': dir,
-          \ 'repo': fugitive#repo(dir),
+          \ 'git_dir': git_dir,
+          \ 'repo': {'git_dir': git_dir},
           \ 'remote': raw,
-          \ 'revision': 'No longer provided',
+          \ 'remote_name': remote,
           \ 'commit': commit,
           \ 'path': path,
           \ 'type': type,
@@ -6558,7 +7359,7 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
     endfor
 
     if empty(url)
-      call s:throw("No GBrowse handler installed for '".raw."'")
+      throw "fugitive: no GBrowse handler installed for '".raw."'"
     endif
 
     return s:BrowserOpen(url, a:mods, a:bang)
@@ -6625,23 +7426,31 @@ function! s:NavigateUp(count) abort
 endfunction
 
 function! s:MapMotion(lhs, rhs) abort
-  call s:Map('n', a:lhs, ":<C-U>" . a:rhs . "<CR>", "<silent>")
-  call s:Map('o', a:lhs, ":<C-U>" . a:rhs . "<CR>", "<silent>")
-  call s:Map('x', a:lhs, ":<C-U>exe 'normal! gv'<Bar>" . a:rhs . "<CR>", "<silent>")
+  let maps = [
+        \ s:Map('n', a:lhs, ":<C-U>" . a:rhs . "<CR>", "<silent>"),
+        \ s:Map('o', a:lhs, ":<C-U>" . a:rhs . "<CR>", "<silent>"),
+        \ s:Map('x', a:lhs, ":<C-U>exe 'normal! gv'<Bar>" . a:rhs . "<CR>", "<silent>")]
+  call filter(maps, '!empty(v:val)')
+  return join(maps, '|')
 endfunction
 
 function! fugitive#MapJumps(...) abort
   if !&modifiable
     if get(b:, 'fugitive_type', '') ==# 'blob'
-      let blame_map = 'Git blame<C-R>=v:count ? " --reverse" : ""<CR><CR>'
-      call s:Map('n', '<2-LeftMouse>', ':<C-U>0,1' . blame_map, '<silent>')
-      call s:Map('n', '<CR>', ':<C-U>0,1' . blame_map, '<silent>')
-      call s:Map('n', 'o',    ':<C-U>0,2' . blame_map, '<silent>')
-      call s:Map('n', 'p',    ':<C-U>0,3' . blame_map, '<silent>')
-      call s:Map('n', 'gO',   ':<C-U>0,4' . blame_map, '<silent>')
-      call s:Map('n', 'O',    ':<C-U>0,5' . blame_map, '<silent>')
+      let blame_tail = '<C-R>=v:count ? " --reverse" : ""<CR><CR>'
+      exe s:Map('n', '<2-LeftMouse>', ':<C-U>0,1Git ++curwin blame' . blame_tail, '<silent>')
+      exe s:Map('n', '<CR>', ':<C-U>0,1Git ++curwin blame' . blame_tail, '<silent>')
+      exe s:Map('n', 'o',    ':<C-U>0,1Git blame' . blame_tail, '<silent>')
+      exe s:Map('n', 'p',    ':<C-U>0,1Git blame!' . blame_tail, '<silent>')
+      if has('patch-7.4.1898')
+        exe s:Map('n', 'gO',   ':<C-U>vertical 0,1Git blame' . blame_tail, '<silent>')
+        exe s:Map('n', 'O',    ':<C-U>tab 0,1Git blame' . blame_tail, '<silent>')
+      else
+        exe s:Map('n', 'gO',   ':<C-U>0,4Git blame' . blame_tail, '<silent>')
+        exe s:Map('n', 'O',    ':<C-U>0,5Git blame' . blame_tail, '<silent>')
+      endif
 
-      call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent>')
+      call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent><unique>')
       call s:Map('n', 'dd', ":<C-U>call fugitive#DiffClose()<Bar>Gdiffsplit!<CR>", '<silent>')
       call s:Map('n', 'dh', ":<C-U>call fugitive#DiffClose()<Bar>Ghdiffsplit!<CR>", '<silent>')
       call s:Map('n', 'ds', ":<C-U>call fugitive#DiffClose()<Bar>Ghdiffsplit!<CR>", '<silent>')
@@ -6657,12 +7466,8 @@ function! fugitive#MapJumps(...) abort
       call s:Map('n', 'p',    ':<C-U>exe <SID>GF("pedit")<CR>', '<silent>')
 
       if !exists('g:fugitive_no_maps')
-        if exists(':CtrlP') && get(g:, 'ctrl_p_map') =~? '^<c-p>$'
-          nnoremap <buffer> <silent> <C-P> :<C-U>execute line('.') == 1 ? 'CtrlP ' . fnameescape(<SID>Tree()) : <SID>PreviousItem(v:count1)<CR>
-        else
-          nnoremap <buffer> <silent> <C-P> :<C-U>execute <SID>PreviousItem(v:count1)<CR>
-        endif
-        nnoremap <buffer> <silent> <C-N> :<C-U>execute <SID>NextItem(v:count1)<CR>
+        call s:Map('n', '<C-P>', ':exe <SID>PreviousItem(v:count1)<Bar>echohl WarningMsg<Bar>echo "CTRL-P is deprecated in favor of ("<Bar>echohl NONE<CR>', '<unique>')
+        call s:Map('n', '<C-N>', ':exe <SID>NextItem(v:count1)<Bar>echohl WarningMsg<Bar>echo "CTRL-N is deprecated in favor of )"<Bar>echohl NONE<CR>', '<unique>')
       endif
       call s:MapMotion('(', 'exe <SID>PreviousItem(v:count1)')
       call s:MapMotion(')', 'exe <SID>NextItem(v:count1)')
@@ -6681,13 +7486,13 @@ function! fugitive#MapJumps(...) abort
       call s:Map('nxo', '*', '<SID>PatchSearchExpr(0)', '<expr>')
       call s:Map('nxo', '#', '<SID>PatchSearchExpr(1)', '<expr>')
     endif
-    call s:Map('n', 'S',    ':<C-U>echoerr "Use gO"<CR>', '<silent>')
+    call s:Map('n', 'S',    ':<C-U>echoerr "Use gO"<CR>', '<silent><unique>')
     call s:Map('n', 'dq', ":<C-U>call fugitive#DiffClose()<CR>", '<silent>')
     call s:Map('n', '-', ":<C-U>exe 'Gedit ' . <SID>fnameescape(<SID>NavigateUp(v:count1))<Bar> if getline(1) =~# '^tree \x\{40,\}$' && empty(getline(2))<Bar>call search('^'.escape(expand('#:t'),'.*[]~\').'/\=$','wc')<Bar>endif<CR>", '<silent>')
     call s:Map('n', 'P',     ":<C-U>exe 'Gedit ' . <SID>fnameescape(<SID>ContainingCommit().'^'.v:count1.<SID>Relative(':'))<CR>", '<silent>')
     call s:Map('n', '~',     ":<C-U>exe 'Gedit ' . <SID>fnameescape(<SID>ContainingCommit().'~'.v:count1.<SID>Relative(':'))<CR>", '<silent>')
     call s:Map('n', 'C',     ":<C-U>exe 'Gedit ' . <SID>fnameescape(<SID>ContainingCommit())<CR>", '<silent>')
-    call s:Map('n', 'cp',    ":<C-U>echoerr 'Use gC'<CR>", '<silent>')
+    call s:Map('n', 'cp',    ":<C-U>echoerr 'Use gC'<CR>", '<silent><unique>')
     call s:Map('n', 'gC',    ":<C-U>exe 'Gpedit ' . <SID>fnameescape(<SID>ContainingCommit())<CR>", '<silent>')
     call s:Map('n', 'gc',    ":<C-U>exe 'Gpedit ' . <SID>fnameescape(<SID>ContainingCommit())<CR>", '<silent>')
     call s:Map('n', 'gi',    ":<C-U>exe 'Gsplit' (v:count ? '.gitignore' : '.git/info/exclude')<CR>", '<silent>')
@@ -6777,7 +7582,7 @@ endfunction
 
 function! fugitive#GX() abort
   try
-    let results = &filetype ==# 'fugitive' ? s:StatusCfile() : &filetype ==# 'git' ? s:cfile() : []
+    let results = &filetype ==# 'fugitive' ? s:CfilePorcelain() : &filetype ==# 'git' ? s:cfile() : []
     if len(results) && len(results[0])
       return FugitiveReal(s:Generate(results[0]))
     endif
@@ -6786,7 +7591,7 @@ function! fugitive#GX() abort
   return expand(get(g:, 'netrw_gx', expand('<cfile>')))
 endfunction
 
-function! s:StatusCfile(...) abort
+function! s:CfilePorcelain(...) abort
   let tree = s:Tree()
   if empty(tree)
     return ['']
@@ -6813,42 +7618,54 @@ function! s:StatusCfile(...) abort
   endif
 endfunction
 
-function! fugitive#StatusCfile() abort
-  let file = fugitive#Find(s:StatusCfile()[0])
+function! fugitive#PorcelainCfile() abort
+  let file = fugitive#Find(s:CfilePorcelain()[0])
   return empty(file) ? fugitive#Cfile() : s:fnameescape(file)
 endfunction
 
-function! s:MessageCfile(...) abort
+function! s:StatusCfile(...) abort
   let tree = s:Tree()
   if empty(tree)
     return ''
   endif
   let lead = s:cpath(tree, getcwd()) ? './' : tree . '/'
   if getline('.') =~# '^.\=\trenamed:.* -> '
-    return lead . matchstr(getline('.'),' -> \zs.*')
+    return [lead . matchstr(getline('.'),' -> \zs.*')]
   elseif getline('.') =~# '^.\=\t\(\k\| \)\+\p\?: *.'
-    return lead . matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
+    return [lead . matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')]
   elseif getline('.') =~# '^.\=\t.'
-    return lead . matchstr(getline('.'),'\t\zs.*')
+    return [lead . matchstr(getline('.'),'\t\zs.*')]
   elseif getline('.') =~# ': needs merge$'
-    return lead . matchstr(getline('.'),'.*\ze: needs merge$')
+    return [lead . matchstr(getline('.'),'.*\ze: needs merge$')]
   elseif getline('.') =~# '^\%(. \)\=Not currently on any branch.$'
-    return 'HEAD'
+    return ['HEAD']
   elseif getline('.') =~# '^\%(. \)\=On branch '
-    return 'refs/heads/'.getline('.')[12:]
+    return ['refs/heads/'.getline('.')[12:]]
   elseif getline('.') =~# "^\\%(. \\)\=Your branch .*'"
-    return matchstr(getline('.'),"'\\zs\\S\\+\\ze'")
+    return [matchstr(getline('.'),"'\\zs\\S\\+\\ze'")]
   else
-    return ''
+    return []
   endif
 endfunction
 
 function! fugitive#MessageCfile() abort
-  let file = fugitive#Find(s:MessageCfile())
+  let file = fugitive#Find(get(s:StatusCfile(), 0, ''))
   return empty(file) ? fugitive#Cfile() : s:fnameescape(file)
 endfunction
 
+function! s:BranchCfile(result) abort
+  return matchstr(getline('.'), '^. \zs\S\+')
+endfunction
+
 function! s:cfile() abort
+  let temp_state = s:TempState()
+  let name = substitute(get(get(temp_state, 'args', []), 0, ''), '\%(^\|-\)\(\l\)', '\u\1', 'g')
+  if exists('*s:' . name . 'Cfile')
+    let cfile = s:{name}Cfile(temp_state)
+    if !empty(cfile)
+      return type(cfile) == type('') ? [cfile] : cfile
+    endif
+  endif
   if empty(FugitiveGitDir())
     return []
   endif
@@ -6861,7 +7678,7 @@ function! s:cfile() abort
         let myhash = ''
       endtry
     endif
-    if empty(myhash) && get(s:TempState(), 'filetype', '') ==# 'git'
+    if empty(myhash) && get(temp_state, 'filetype', '') ==# 'git'
       let lnum = line('.')
       while lnum > 0
         if getline(lnum) =~# '^\%(commit\|tag\) \w'
@@ -6896,7 +7713,7 @@ function! s:cfile() abort
       if getline('.') =~# '^ref: '
         let ref = strpart(getline('.'),5)
 
-      elseif getline('.') =~# '^commit \x\{40,\}\>'
+      elseif getline('.') =~# '^\%([|/\\_ ]*\*[|/\\_ ]*\)\=commit \x\{40,\}\>'
         let ref = matchstr(getline('.'),'\x\{40,\}')
         return [ref]
 
@@ -6928,6 +7745,15 @@ function! s:cfile() abort
         let ref = matchstr(getline('.'),'\x\{40,\}')
         echoerr "warning: unknown context ".matchstr(getline('.'),'^\l*')
 
+      elseif getline('.') =~# '^[A-Z]\d*\t\S' && len(myhash)
+        let files = split(getline('.'), "\t")[1:-1]
+        let ref = 'b/' . files[-1]
+        if getline('.') =~# '^D'
+          let ref = 'a/' . files[0]
+        elseif getline('.') !~# '^A'
+          let dcmds = ['', 'Gdiffsplit! >' . myhash . '^:' . fnameescape(files[0])]
+        endif
+
       elseif getline('.') =~# '^[+-]\{3\} [abciow12]\=/'
         let ref = getline('.')[4:]
 
@@ -7002,7 +7828,7 @@ function! s:cfile() abort
       endif
 
       if exists('dref')
-        return [ref, dcmd . ' ' . s:fnameescape(dref)] + dcmds
+        return [ref, dcmd . ' >' . s:fnameescape(dref)] + dcmds
       elseif ref != ""
         return [ref] + dcmds
       endif
@@ -7014,14 +7840,20 @@ endfunction
 
 function! s:GF(mode) abort
   try
-    let results = &filetype ==# 'fugitive' ? s:StatusCfile() : &filetype ==# 'gitcommit' ? [s:MessageCfile()] : s:cfile()
+    let results = &filetype ==# 'fugitive' ? s:CfilePorcelain() : &filetype ==# 'gitcommit' ? s:StatusCfile() : s:cfile()
   catch /^fugitive:/
     return 'echoerr ' . string(v:exception)
   endtry
   if len(results) > 1
-    return 'G' . a:mode .
-          \ ' +' . escape(results[1], ' ') . ' ' .
-          \ s:fnameescape(results[0]) . join(map(results[2:-1], '"|" . v:val'), '')
+    let cmd = 'G' . a:mode .
+          \ (empty(results[1]) ? '' : ' +' . escape(results[1], ' |')) . ' ' .
+          \ fnameescape(results[0])
+    let tail = join(map(results[2:-1], '"|" . v:val'), '')
+    if a:mode ==# 'pedit' && len(tail)
+      return cmd . '|wincmd P|exe ' . string(tail[1:-1]) . '|wincmd p'
+    else
+      return cmd . tail
+    endif
   elseif len(results) && len(results[0])
     return 'G' . a:mode . ' ' . s:fnameescape(results[0])
   else
@@ -7033,6 +7865,12 @@ function! fugitive#Cfile() abort
   let pre = ''
   let results = s:cfile()
   if empty(results)
+    if !empty(s:TempState())
+      let cfile = s:TempDotMap()
+      if !empty(cfile)
+        return fnameescape(s:Generate(cfile))
+      endif
+    endif
     let cfile = expand('<cfile>')
     if &includeexpr =~# '\<v:fname\>'
       sandbox let cfile = eval(substitute(&includeexpr, '\C\<v:fname\>', '\=string(cfile)', 'g'))
@@ -7041,7 +7879,7 @@ function! fugitive#Cfile() abort
   elseif len(results) > 1
     let pre = '+' . join(map(results[1:-1], 'escape(v:val, " ")'), '\|') . ' '
   endif
-  return pre . s:fnameescape(s:Generate(results[0]))
+  return pre . fnameescape(s:Generate(results[0]))
 endfunction
 
 " Section: Statusline
diff --git a/sources_non_forked/vim-fugitive/doc/fugitive.txt b/sources_non_forked/vim-fugitive/doc/fugitive.txt
index fd0ab2e6..f089d749 100644
--- a/sources_non_forked/vim-fugitive/doc/fugitive.txt
+++ b/sources_non_forked/vim-fugitive/doc/fugitive.txt
@@ -15,9 +15,12 @@ COMMANDS                                        *fugitive-commands*
 These commands are local to the buffers in which they work (generally, buffers
 that are part of Git repositories).
 
-                                                *:Git* *fugitive-:G*
+                                                *fugitive-:G*
+:G [args]               Same as :Git, but two characters shorter.
+
+                                                *:Git*
 :Git {args}             Run an arbitrary git command and display any output.
-:G {args}               On UNIX this uses a pty and on other platforms it uses
+                        On UNIX this uses a pty and on other platforms it uses
                         a pipe, which will cause some behavior differences
                         such as the absence of progress bars.  Any file the
                         command edits (for example, a commit message) will be
@@ -25,17 +28,28 @@ that are part of Git repositories).
                         resume running the command.  A few Git subcommands
                         have different behavior; these are documented below.
 
+                                                *:Git!*
+:Git! {args}            Run an arbitrary git command in the background and
+                        stream the output to the preview window.  Requires a
+                        Vim with |setbufline()|.  Press CTRL-D during an
+                        interactive :Git invocation to switch to this mode
+                        retroactively.
+
                                                 *:Git_--paginate* *:Git_-p*
 :Git --paginate {args}  Run an arbitrary git command, capture output to a temp
-:Git -p {args}          file, and |:split| that temp file.  Use :0Git to
-:G --paginate {args}    |:edit| the temp file instead.  A temp file is always
-:G -p {args}            used for commands like diff and log that typically
-                        user a pager, and for any command that has the
-                        pager.<cmd> Git configuration option set.
+:Git -p {args}          file, and |:split| that temp file.  Pass ++curwin as
+                        the first argument to |:edit| the temp file instead.
+                        A temp file is always used for commands like diff and
+                        log that typically uses a pager, and for any command
+                        that has the pager.<cmd> Git configuration option set.
+
+:{range}Git! --paginate {args}
+:{range}Git! -p {args}  Run an arbitrary git command, and insert the output
+                        after {range} in the current buffer.
 
                                                 *fugitive-summary*
 :Git                    With no arguments, bring up a summary window vaguely
-:G                      akin to git-status.  Press g? or see |fugitive-maps|
+                        akin to git-status.  Press g? or see |fugitive-maps|
                         for usage.
 
                                                 *:Git_blame*
@@ -84,13 +98,17 @@ that are part of Git repositories).
                                                 *:Git_mergetool*
 :Git mergetool [args]   Like |:Git_difftool|, but target merge conflicts.
 
-                                                *:Ggrep* *:Gcgrep* *:Git_grep*
-:Ggrep[!] [args]        |:grep|[!] with git-grep as 'grepprg'.
-:Git[!] grep [args]
+                                                *:Ggrep* *:Git_grep*
+:Ggrep[!] [args]        An approximation of |:grep|[!] with git-grep as
+:Git[!] grep -O [args]  'grepprg'.
+
+:Ggrep[!] --quiet [args]
+:Ggrep[!] -q [args]     Like |:Ggrep|, but instead of displaying output, open
+                        the quickfix list.
 
                                                 *:Glgrep*
-:Glgrep[!] [args]       |:lgrep|[!] with git-grep as 'grepprg'.
-:0Git[!] grep [args]
+:Glgrep[!] [args]       :Ggrep but for |:lgrep|.
+:0Git[!] grep -O [args]
 
                                                  *:Gclog*
 :Gclog[!] [args]        Use git-log [args] to load the commit history into the
@@ -170,10 +188,10 @@ that are part of Git repositories).
 :Gdiffsplit [object]    Perform a |vimdiff| against the given file, or if a
                         commit is given, the current file in that commit.
                         With no argument, the version in the index or work
-                        tree is used.  The newer of the two files is placed to
-                        the right or bottom, depending on 'diffopt' and the
-                        width of the window relative to 'textwidth'.  Use
-                        Vim's |do| and |dp| to stage and unstage changes.
+                        tree is used, and the work tree version is always
+                        placed to the right or bottom, depending on available
+                        width.  Use Vim's |do| and |dp| to stage and unstage
+                        changes.
 
                                                 *:Gdiffsplit!*
 :Gdiffsplit!            Diff against any and all direct ancestors, retaining
@@ -190,7 +208,10 @@ that are part of Git repositories).
 :Gvdiffsplit [object]   Like |:Gdiffsplit|, but always split vertically.
 
                                                 *:Ghdiffsplit*
-:Ghdiffsplit [object]   Like |:Gdiffsplit|, but always split horizontally.
+:Gdiffsplit ++novertical [object]
+:Ghdiffsplit [object]   Like |:Gdiffsplit|, but with "vertical" removed from
+                        'diffopt'.  The split will still be vertical if
+                        combined with |:vertical|.
 
                                                 *:GMove*
 :GMove {destination}    Wrapper around git-mv that renames the buffer
@@ -606,11 +627,8 @@ AUTOCOMMANDS                                    *fugitive-autocommands*
 A handful of |User| |autocommands| are provided to allow extending and
 overriding Fugitive behaviors.  Example usage:
 >
-        autocmd User FugitiveBlob call s:BlobOverrides()
+        autocmd User FugitiveBlob,FugitiveStageBlob call s:BlobOverrides()
 <
-                                                *User_FugitiveIndex*
-FugitiveIndex           After loading the |fugitive-summary| buffer.
-
                                                 *User_FugitiveTag*
 FugitiveTag             After loading a tag object.
 
@@ -621,10 +639,26 @@ FugitiveCommit          After loading a commit object.
 FugitiveTree            After loading a tree (directory) object.
 
                                                 *User_FugitiveBlob*
-FugitiveBlob            After loading a blob (file) object.  This includes
-                        both committed blobs which are read only, and staged
-                        blobs which can be edited and written.  Check
-                        &modifiable to distinguish between the two.
+FugitiveBlob            After loading a committed blob (file) object.
+
+                                                *User_FugitiveObject*
+FugitiveObject          After loading any of the 4 above buffer types.
+
+                                                *User_FugitiveStageBlob*
+FugitiveStageBlob       After loading a staged blob (file) object.  These
+                        buffers are 'modifiable' and oftentimes don't want the
+                        same behavior as the other buffer types.
+
+                                                *User_FugitiveIndex*
+FugitiveIndex           After loading the |fugitive-summary| buffer.
+
+                                                *User_FugitivePager*
+FugitivePager           After loading a temp file created by a command like
+                        :Git --paginate or :Git blame.
+
+                                                *User_FugitiveEditor*
+FugitiveEditor          After a :Git command (e.g., :Git commit) edits a file
+                        (e.g., the commit message).
 
                                                 *User_FugitiveChanged*
 FugitiveChanged         After any event which can potentially change the
@@ -661,7 +695,6 @@ version.
 *:Gfetch*       Superseded by |:Git| fetch.
 *:Glog*         Superseded by |:Gclog|.
 *:Gstatus*      Superseded by |:Git| (with no arguments).
-*:Git!*         Superseded by |:Git_--paginate|.
 *:Gsplit!*      Superseded by |:Git_--paginate|.
 *:Gvsplit!*     Superseded by :vert Git --paginate.
 *:Gtabsplit!*   Superseded by :tab Git --paginate.
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 6be65046..c28fd5cc 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -1,6 +1,6 @@
 " fugitive.vim - A Git wrapper so awesome, it should be illegal
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      3.3
+" Version:      3.4
 " GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
 
 if exists('g:loaded_fugitive')
@@ -16,9 +16,9 @@ let s:bad_git_dir = '/$\|^fugitive:'
 " Fugitive is active in the current buffer.  Do not rely on this for direct
 " filesystem access; use FugitiveFind('.git/whatever') instead.
 function! FugitiveGitDir(...) abort
-  if v:version < 704
+  if v:version < 703
     return ''
-  elseif !a:0 || type(a:1) == type(0) && a:1 < 0
+  elseif !a:0 || type(a:1) == type(0) && a:1 < 0 || a:1 is# get(v:, 'true', -1)
     if exists('g:fugitive_event')
       return g:fugitive_event
     endif
@@ -30,7 +30,7 @@ function! FugitiveGitDir(...) abort
       return b:git_dir
     endif
     return dir =~# s:bad_git_dir ? '' : dir
-  elseif type(a:1) == type(0)
+  elseif type(a:1) == type(0) && a:1 isnot# 0
     if a:1 == bufnr('') && (!exists('b:git_dir') || b:git_dir =~# s:bad_git_dir) && empty(&buftype)
       let b:git_dir = FugitiveExtractGitDir(expand('%:p'))
     endif
@@ -55,7 +55,11 @@ endfunction
 " exists, call FooReal("foo://bar").
 function! FugitiveReal(...) abort
   let file = a:0 ? a:1 : @%
-  if file =~# '^\a\a\+:' || a:0 > 1
+  if type(file) ==# type({})
+    let dir = FugitiveGitDir(file)
+    let tree = s:Tree(dir)
+    return FugitiveVimPath(empty(tree) ? dir : tree)
+  elseif file =~# '^\a\a\+:' || a:0 > 1
     return call('fugitive#Real', [file] + a:000[1:-1])
   elseif file =~# '^/\|^\a:\|^$'
     return file
@@ -72,14 +76,10 @@ endfunction
 " An optional second argument provides the Git dir, or the buffer number of a
 " buffer with a Git dir.  The default is the current buffer.
 function! FugitiveFind(...) abort
-  return fugitive#Find(a:0 ? a:1 : bufnr(''), FugitiveGitDir(a:0 > 1 ? a:2 : -1))
-endfunction
-
-function! FugitivePath(...) abort
-  if a:0 > 1
-    return fugitive#Path(a:1, a:2, FugitiveGitDir(a:0 > 2 ? a:3 : -1))
+  if a:0 && (type(a:1) ==# type({}) || type(a:1) ==# type(0))
+    return call('fugitive#Find', a:000[1:-1] + [FugitiveGitDir(a:1)])
   else
-    return FugitiveReal(a:0 ? a:1 : @%)
+    return fugitive#Find(a:0 ? a:1 : bufnr(''), FugitiveGitDir(a:0 > 1 ? a:2 : -1))
   endif
 endfunction
 
@@ -99,6 +99,14 @@ function! FugitiveParse(...) abort
   throw v:errmsg
 endfunction
 
+" FugitiveGitVersion() queries the version of Git in use.  Pass up to 3
+" arguments to return a Boolean of whether a certain minimum version is
+" available (FugitiveGitVersion(2,3,4) checks for 2.3.4 or higher) or no
+" arguments to get a raw string.
+function! FugitiveGitVersion(...) abort
+  return call('fugitive#GitVersion', a:000)
+endfunction
+
 " FugitiveResult() returns an object encapsulating the result of the most
 " recent :Git command.  Will be empty if no result is available.  During a
 " User FugitiveChanged event, this is guaranteed to correspond to the :Git
@@ -108,7 +116,7 @@ endfunction
 "
 " * "args": List of command arguments, starting with the subcommand.  Will be
 "   empty for usages like :Git --help.
-" * "dir": Git dir of the relevant repository.
+" * "git_dir": Git dir of the relevant repository.
 " * "exit_status": The integer exit code of the process.
 " * "flags": Flags passed directly to Git, like -c and --help.
 " * "file": Path to file containing command output.  Not guaranteed to exist,
@@ -117,16 +125,44 @@ function! FugitiveResult(...) abort
   return call('fugitive#Result', a:000)
 endfunction
 
-" FugitivePrepare() constructs a Git command string which can be executed with
-" functions like system() and commands like :!.  Integer arguments will be
-" treated as buffer numbers, and the appropriate relative path inserted in
-" their place.
+" FugitiveExecute() runs Git with a list of arguments and returns a dictionary
+" with the following keys:
 "
-" If the first argument is a string that looks like a path or an empty string,
-" it will be used as the Git dir.  If it's a buffer number, the Git dir for
-" that buffer will be used.  The default is the current buffer.
+" * "exit_status": The integer exit code of the process.
+" * "stdout": The stdout produced by the process, as a list of lines.
+" * "stderr": The stdout produced by the process, as a list of lines.
+"
+" An optional second argument provides the Git dir, or the buffer number of a
+" buffer with a Git dir.  The default is the current buffer.
+"
+" An optional final argument is a callback Funcref, for asynchronous
+" execution.
+function! FugitiveExecute(args, ...) abort
+  return call('fugitive#Execute', [a:args] + a:000)
+endfunction
+
+" FugitiveShellCommand() turns an array of arugments into a Git command string
+" which can be executed with functions like system() and commands like :!.
+" Integer arguments will be treated as buffer numbers, and the appropriate
+" relative path inserted in their place.
+"
+" An optional second argument provides the Git dir, or the buffer number of a
+" buffer with a Git dir.  The default is the current buffer.
+function! FugitiveShellCommand(...) abort
+  return call('fugitive#ShellCommand', a:000)
+endfunction
+
+" FugitivePrepare() is a deprecated alias for FugitiveShellCommand().  If you
+" are using this in conjunction with system(), consider using
+" FugitiveExecute() instead.
 function! FugitivePrepare(...) abort
-  return call('fugitive#Prepare', a:000)
+  if !exists('s:did_prepare_warning')
+    let s:did_prepare_warning = 1
+    echohl WarningMsg
+    unsilent echomsg 'FugitivePrepare() has been superseded by FugitiveShellCommand()'
+    echohl NONE
+  endif
+  return call('fugitive#ShellCommand', a:000)
 endfunction
 
 " FugitiveConfig() get returns an opaque structure that can be passed to other
@@ -171,7 +207,19 @@ endfunction
 " An optional second argument provides the Git dir, or the buffer number of a
 " buffer with a Git dir.  The default is the current buffer.
 function! FugitiveRemoteUrl(...) abort
-  return fugitive#RemoteUrl(a:0 ? a:1 : '', a:0 > 1 ? a:2 : -1, a:0 > 2 ? a:3 : 0)
+  return call('fugitive#RemoteUrl', a:000)
+endfunction
+
+" FugitiveDidChange() triggers a FugitiveChanged event and reloads the summary
+" buffer for the current or given buffer number's repository.  You can also
+" give the result of a FugitiveExecute() and that context will be made
+" available inside the FugitiveChanged() event.
+"
+" Passing the special argument 0 (the number zero) softly expires summary
+" buffers for all repositories.  This can be used after a call to system()
+" with unclear implications.
+function! FugitiveDidChange(...) abort
+  return call('fugitive#DidChange', a:000)
 endfunction
 
 " FugitiveHead() retrieves the name of the current branch. If the current HEAD
@@ -182,15 +230,36 @@ endfunction
 " An optional second argument provides the Git dir, or the buffer number of a
 " buffer with a Git dir.  The default is the current buffer.
 function! FugitiveHead(...) abort
-  let dir = FugitiveGitDir(a:0 > 1 ? a:2 : -1)
+  if a:0 && (type(a:1) ==# type({}) || type(a:1) ==# type('') && a:1 !~# '^\d\+$')
+    let dir = FugitiveGitDir(a:1)
+    let arg = get(a:, 2, 0)
+  elseif a:0 > 1
+    let dir = FugitiveGitDir(a:2)
+    let arg = a:1
+  else
+    let dir = FugitiveGitDir()
+    let arg = get(a:, 1, 0)
+  endif
   if empty(dir)
     return ''
   endif
-  return fugitive#Head(a:0 ? a:1 : 0, dir)
+  return fugitive#Head(arg, dir)
+endfunction
+
+function! FugitivePath(...) abort
+  if a:0 > 2 && type(a:1) ==# type({})
+    return fugitive#Path(a:2, a:3, FugitiveGitDir(a:1))
+  elseif a:0 && type(a:1) ==# type({})
+    return FugitiveReal(a:0 > 1 ? a:2 : @%)
+  elseif a:0 > 1
+    return fugitive#Path(a:1, a:2, FugitiveGitDir(a:0 > 2 ? a:3 : -1))
+  else
+    return FugitiveReal(a:0 ? a:1 : @%)
+  endif
 endfunction
 
 function! FugitiveStatusline(...) abort
-  if empty(get(b:, 'git_dir', ''))
+  if empty(FugitiveGitDir(bufnr('')))
     return ''
   endif
   return fugitive#Statusline()
@@ -213,9 +282,12 @@ function! FugitiveWorkTree(...) abort
   endif
 endfunction
 
-function! FugitiveIsGitDir(path) abort
-  let path = substitute(a:path, '[\/]$', '', '') . '/'
-  return len(a:path) && getfsize(path.'HEAD') > 10 && (
+function! FugitiveIsGitDir(...) abort
+  if !a:0 || type(a:1) !=# type('')
+    return !empty(call('FugitiveGitDir', a:000))
+  endif
+  let path = substitute(a:1, '[\/]$', '', '') . '/'
+  return len(path) && getfsize(path.'HEAD') > 10 && (
         \ isdirectory(path.'objects') && isdirectory(path.'refs') ||
         \ getftype(path.'commondir') ==# 'file')
 endfunction
@@ -279,7 +351,13 @@ function! s:CeilingDirectories() abort
 endfunction
 
 function! FugitiveExtractGitDir(path) abort
-  let path = s:Slash(a:path)
+  if type(a:path) ==# type({})
+    return get(a:path, 'git_dir', '')
+  elseif type(a:path) == type(0)
+    let path = s:Slash(a:path >= 0 ? bufname(a:path) : bufname(''))
+  else
+    let path = s:Slash(a:path)
+  endif
   if path =~# '^fugitive:'
     return matchstr(path, '\C^fugitive:\%(//\)\=\zs.\{-\}\ze\%(//\|::\|$\)')
   elseif empty(path)
@@ -335,15 +413,18 @@ function! FugitiveExtractGitDir(path) abort
   return ''
 endfunction
 
-function! FugitiveDetect(path) abort
-  if v:version < 704
+function! FugitiveDetect(...) abort
+  if v:version < 703
     return ''
   endif
   if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir
     unlet b:git_dir
   endif
+  if a:0 > 1 && a:2 is# 0 && !exists('#User#Fugitive')
+    return ''
+  endif
   if !exists('b:git_dir')
-    let b:git_dir = FugitiveExtractGitDir(a:path)
+    let b:git_dir = FugitiveExtractGitDir(a:0 ? a:1 : bufnr(''))
   endif
   if empty(b:git_dir) || !exists('#User#Fugitive')
     return ''
@@ -397,14 +478,14 @@ function! s:ProjectionistDetect() abort
     if exists('+shellslash') && !&shellslash
       let base = tr(base, '/', '\')
     endif
-    let file = FugitiveCommonDir(dir) . '/info/projections.json'
+    let file = FugitiveFind('.git/info/projections.json', dir)
     if filereadable(file)
       call projectionist#append(base, file)
     endif
   endif
 endfunction
 
-let s:addr_other = has('patch-8.1.560') ? '-addr=other' : ''
+let s:addr_other = has('patch-8.1.560') || has('nvim-0.5.0') ? '-addr=other' : ''
 let s:addr_tabs  = has('patch-7.4.542') ? '-addr=tabs' : ''
 let s:addr_wins  = has('patch-7.4.542') ? '-addr=windows' : ''
 
@@ -413,16 +494,22 @@ if exists(':G') != 2
 endif
 command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete Git exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)
 
-if exists(':Gstatus') != 2 && get(g:, 'fugitive_legacy_commands', 1)
+if exists(':Gstatus') != 2 && get(g:, 'fugitive_legacy_commands', 0)
   exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
         \ '|echohl WarningMSG|echomsg ":Gstatus is deprecated in favor of :Git (with no arguments)"|echohl NONE'
+elseif exists(':Gstatus') != 2 && !exists('g:fugitive_legacy_commands')
+  exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus'
+        \ ' echoerr ":Gstatus has been removed in favor of :Git (with no arguments)"'
 endif
 
 for s:cmd in ['Commit', 'Revert', 'Merge', 'Rebase', 'Pull', 'Push', 'Fetch', 'Blame']
-  if exists(':G' . tolower(s:cmd)) != 2 && get(g:, 'fugitive_legacy_commands', 1)
+  if exists(':G' . tolower(s:cmd)) != 2 && get(g:, 'fugitive_legacy_commands', 0)
     exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
           \ 'echohl WarningMSG|echomsg ":G' . tolower(s:cmd) . ' is deprecated in favor of :Git ' . tolower(s:cmd) . '"|echohl NONE|'
           \ 'exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "' . tolower(s:cmd) . ' " . <q-args>)'
+  elseif exists(':G' . tolower(s:cmd)) != 2 && !exists('g:fugitive_legacy_commands')
+    exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
+          \ 'echoerr ":G' . tolower(s:cmd) . ' has been removed in favor of :Git ' . tolower(s:cmd) . '"'
   endif
 endfor
 unlet s:cmd
@@ -431,66 +518,68 @@ exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Gcd
 exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Glcd exe fugitive#Cd(<q-args>, 1)"
 
 exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Ggrep  exe fugitive#GrepCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
-exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Gcgrep exe fugitive#GrepCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
 exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Glgrep exe fugitive#GrepCommand(0, <count> > 0 ? <count> : 0, +"<range>", <bang>0, "<mods>", <q-args>)'
 
-if exists(':Glog') != 2 && get(g:, 'fugitive_legacy_commands', 1)
+if exists(':Glog') != 2 && get(g:, 'fugitive_legacy_commands', 0)
   exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog  :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "")'
         \ '|echohl WarningMSG|echomsg ":Glog is deprecated in favor of :Gclog"|echohl NONE'
+elseif exists(':Glog') != 2 && !exists('g:fugitive_legacy_commands')
+  exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog'
+        \ ' echoerr ":Glog has been removed in favor of :Gclog"'
 endif
 exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gclog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
 exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete GcLog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
 exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gllog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
 exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete GlLog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
 
-exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Ge       exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Gedit    exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#ReadComplete   Gpedit   exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gsplit   exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "split" : "edit"), <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gvsplit  exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "vsplit" : "edit!"), <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -range=-1' s:addr_tabs  '-complete=customlist,fugitive#ReadComplete   Gtabedit exe fugitive#Open((<count> >= 0 ? <count> : "")."tabedit", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Ge       exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Gedit    exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#ReadComplete   Gpedit   exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gsplit   exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "split" : "edit"), <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gvsplit  exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "vsplit" : "edit!"), <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_tabs  '-complete=customlist,fugitive#ReadComplete   Gtabedit exe fugitive#Open((<count> >= 0 ? <count> : "")."tabedit", <bang>0, "<mods>", <q-args>)'
 
 if exists(':Gr') != 2
-  exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gr     exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+  exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gr     exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
 endif
-exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gread    exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gread    exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
 
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gdiffsplit  exe fugitive#Diffsplit(1, <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Ghdiffsplit exe fugitive#Diffsplit(0, <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gvdiffsplit exe fugitive#Diffsplit(0, <bang>0, "vertical <mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gdiffsplit  exe fugitive#Diffsplit(1, <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Ghdiffsplit exe fugitive#Diffsplit(0, <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gvdiffsplit exe fugitive#Diffsplit(0, <bang>0, "vertical <mods>", <q-args>)'
 
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gw     exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwrite exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwq    exe fugitive#WqCommand(   <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gw     exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwrite exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwq    exe fugitive#WqCommand(   <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
 
-exe 'command! -bar -bang -nargs=0 GRemove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=0 GDelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject GMove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete GRename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=0 GRemove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=0 GDelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject GMove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete GRename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
 if exists(':Gremove') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -nargs=0 Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+  exe 'command! -bar -bang -nargs=0 Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
         \ '|echohl WarningMSG|echomsg ":Gremove is deprecated in favor of :GRemove"|echohl NONE'
 endif
 if exists(':Gdelete') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -nargs=0 Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+  exe 'command! -bar -bang -nargs=0 Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
         \ '|echohl WarningMSG|echomsg ":Gdelete is deprecated in favor of :GDelete"|echohl NONE'
 endif
 if exists(':Gmove') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject Gmove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject Gmove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
         \ '|echohl WarningMSG|echomsg ":Gmove is deprecated in favor of :GMove"|echohl NONE'
 endif
 if exists(':Grename') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete Grename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete Grename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
         \ '|echohl WarningMSG|echomsg ":Grename is deprecated in favor of :GRename"|echohl NONE'
 endif
 
-exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject GBrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject GBrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
 if exists(':Gbrowse') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject Gbrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+  exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject Gbrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
         \ '|if <bang>1|redraw!|endif|echohl WarningMSG|echomsg ":Gbrowse is deprecated in favor of :GBrowse"|echohl NONE'
 endif
 
-if v:version < 704
+if v:version < 703
   finish
 endif
 
@@ -514,8 +603,9 @@ let g:io_fugitive = {
 augroup fugitive
   autocmd!
 
-  autocmd BufNewFile,BufReadPost * call FugitiveDetect(expand('<amatch>:p'))
-  autocmd FileType           netrw call FugitiveDetect(fnamemodify(get(b:, 'netrw_curdir', expand('<amatch>')), ':p'))
+  autocmd BufNewFile,BufReadPost *
+        \    call FugitiveDetect(expand('<amatch>:p'), 0)
+  autocmd FileType           netrw call FugitiveDetect(fnamemodify(get(b:, 'netrw_curdir', expand('<afile>:p')), ':p'), 1)
 
   autocmd FileType git
         \ call fugitive#MapCfile()
@@ -526,7 +616,7 @@ augroup fugitive
         \    setlocal foldtext=fugitive#Foldtext() |
         \ endif
   autocmd FileType fugitive
-        \ call fugitive#MapCfile('fugitive#StatusCfile()')
+        \ call fugitive#MapCfile('fugitive#PorcelainCfile()')
   autocmd FileType gitrebase
         \ let &l:include = '^\%(pick\|squash\|edit\|reword\|fixup\|drop\|[pserfd]\)\>' |
         \ if &l:includeexpr !~# 'Fugitive' |
@@ -570,15 +660,12 @@ endif
 
 let s:nowait = v:version >= 704 ? '<nowait>' : ''
 
-function! s:Map(mode, lhs, rhs, ...) abort
-  for mode in split(a:mode, '\zs')
-    let flags = (a:0 ? a:1 : '') . (a:rhs =~# '<Plug>' ? '' : '<script>')
-    let head = a:lhs
-    let tail = ''
-    let keys = get(g:, mode.'remap', {})
-    if type(keys) == type([])
-      return
-    endif
+function! s:Map(mode, lhs, rhs, flags) abort
+  let flags = a:flags . (a:rhs =~# '<Plug>' ? '' : '<script>')
+  let head = a:lhs
+  let tail = ''
+  let keys = get(g:, a:mode.'remap', {})
+  if len(keys) && type(keys) == type({})
     while !empty(head)
       if has_key(keys, head)
         let head = keys[head]
@@ -590,10 +677,10 @@ function! s:Map(mode, lhs, rhs, ...) abort
       let tail = matchstr(head, '<[^<>]*>$\|.$') . tail
       let head = substitute(head, '<[^<>]*>$\|.$', '', '')
     endwhile
-    if flags !~# '<unique>' || empty(mapcheck(head.tail, mode))
-      exe mode.'map' s:nowait flags head.tail a:rhs
-    endif
-  endfor
+  endif
+  if flags !~# '<unique>' || empty(mapcheck(head.tail, a:mode))
+    exe a:mode.'map' s:nowait flags head.tail a:rhs
+  endif
 endfunction
 
 call s:Map('c', '<C-R><C-G>', 'fnameescape(fugitive#Object(@%))', '<expr>')
diff --git a/sources_non_forked/vim-fugitive/syntax/fugitive.vim b/sources_non_forked/vim-fugitive/syntax/fugitive.vim
index 0ed82dd7..e61b34f9 100644
--- a/sources_non_forked/vim-fugitive/syntax/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/syntax/fugitive.vim
@@ -13,10 +13,10 @@ syn match fugitiveHeader /^Pull:\|^Rebase:\|^Merge:\|^Push:/ nextgroup=fugitiveS
 syn match fugitiveHelpHeader /^Help:/ nextgroup=fugitiveHelpTag skipwhite
 syn match fugitiveHelpTag    /\S\+/ contained
 
-syn region fugitiveSection start=/^\%(.*(\d\+)$\)\@=/ contains=fugitiveHeading end=/^$/
+syn region fugitiveSection start=/^\%(.*(\d\++\=)$\)\@=/ contains=fugitiveHeading end=/^$/
 syn cluster fugitiveSection contains=fugitiveSection
-syn match fugitiveHeading /^[A-Z][a-z][^:]*\ze (\d\+)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite
-syn match fugitiveCount /(\d\+)/hs=s+1,he=e-1 contained
+syn match fugitiveHeading /^[A-Z][a-z][^:]*\ze (\d\++\=)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite
+syn match fugitiveCount /(\d\++\=)/hs=s+1,he=e-1 contained
 syn match fugitivePreposition /\<\%([io]nto\|from\|to\|Rebasing\%( detached\)\=\)\>/ transparent contained nextgroup=fugitiveHash,fugitiveSymbolicRef skipwhite
 
 syn match fugitiveInstruction /^\l\l\+\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
@@ -30,10 +30,10 @@ syn match fugitiveHash /\S\@<!\x\{4,\}\S\@!/ contained
 syn region fugitiveHunk start=/^\%(@@\+ -\)\@=/ end=/^\%([A-Za-z?@]\|$\)\@=/ contains=diffLine,diffRemoved,diffAdded,diffNoEOL containedin=@fugitiveSection fold
 
 for s:section in ['Untracked', 'Unstaged', 'Staged']
-  exe 'syn region fugitive' . s:section . 'Section start=/^\%(' . s:section . ' .*(\d\+)$\)\@=/ contains=fugitive' . s:section . 'Heading end=/^$/'
+  exe 'syn region fugitive' . s:section . 'Section start=/^\%(' . s:section . ' .*(\d\++\=)$\)\@=/ contains=fugitive' . s:section . 'Heading end=/^$/'
   exe 'syn match fugitive' . s:section . 'Modifier /^[MADRCU?] / contained containedin=fugitive' . s:section . 'Section'
   exe 'syn cluster fugitiveSection add=fugitive' . s:section . 'Section'
-  exe 'syn match fugitive' . s:section . 'Heading /^[A-Z][a-z][^:]*\ze (\d\+)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite'
+  exe 'syn match fugitive' . s:section . 'Heading /^[A-Z][a-z][^:]*\ze (\d\++\=)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite'
 endfor
 unlet s:section
 
diff --git a/sources_non_forked/vim-gitgutter/README.mkd b/sources_non_forked/vim-gitgutter/README.mkd
index 5bf9285e..9f93c5bb 100644
--- a/sources_non_forked/vim-gitgutter/README.mkd
+++ b/sources_non_forked/vim-gitgutter/README.mkd
@@ -283,6 +283,9 @@ You can customise:
 * How to handle non-gitgutter signs
 * The signs' colours and symbols
 * Line highlights
+* Line number highlights (only in Neovim 0.3.2 or higher)
+* The diff syntax colours used in the preview window
+* The intra-line diff highlights used in the preview window
 * Whether the diff is relative to the index (default) or working tree.
 * The base of the diff
 * Extra arguments for `git` when running `git diff`
@@ -395,6 +398,35 @@ highlight link GitGutterChangeLineNr Underlined
 ```
 
 
+#### The diff syntax colours used in the preview window
+
+To change the diff syntax colours used in the preview window, set up the `diff*` highlight groups in your colorscheme or `~/.vimrc`:
+
+```viml
+diffAdded   " if not set: use GitGutterAdd's foreground colour
+diffChanged " if not set: use GitGutterChange's foreground colour
+diffRemoved " if not set: use GitGutterDelete's foreground colour
+```
+
+Note the `diff*` highlight groups are used in any buffer whose `'syntax'` is `diff`.
+
+
+#### The intra-line diff highlights used in the preview window
+
+To change the intra-line diff highlights used in the preview window, set up the following highlight groups in your colorscheme or `~/.vimrc`:
+
+```viml
+GitGutterAddIntraLine    " default: gui=reverse cterm=reverse
+GitGutterDeleteIntraLine " default: gui=reverse cterm=reverse
+```
+
+For example, to use `DiffAdd` for intra-line added regions:
+
+```viml
+highlight link GitGutterAddIntraLine DiffAdd
+```
+
+
 #### Whether the diff is relative to the index or working tree
 
 By default diffs are relative to the index.  How you can make them relative to the working tree:
diff --git a/sources_non_forked/vim-gitgutter/autoload/gitgutter.vim b/sources_non_forked/vim-gitgutter/autoload/gitgutter.vim
index 0daa9064..4ccc1419 100644
--- a/sources_non_forked/vim-gitgutter/autoload/gitgutter.vim
+++ b/sources_non_forked/vim-gitgutter/autoload/gitgutter.vim
@@ -205,6 +205,10 @@ function! gitgutter#quickfix(current_file)
     elseif line =~ '^diff --git "'
       let [_, fnamel, _, fnamer] = split(line, '"')
       let fname = fnamel ==# fnamer ? fnamel : fnamel[2:]
+    elseif line =~ '^diff --cc [^"]'
+      let fname = line[10:]
+    elseif line =~ '^diff --cc "'
+      let [_, fname] = split(line, '"')
     elseif line =~ '^@@'
       let lnum = matchlist(line, '+\(\d\+\)')[1]
     elseif lnum > 0
diff --git a/sources_non_forked/vim-gitgutter/autoload/gitgutter/highlight.vim b/sources_non_forked/vim-gitgutter/autoload/gitgutter/highlight.vim
index 68234238..ae05adbb 100644
--- a/sources_non_forked/vim-gitgutter/autoload/gitgutter/highlight.vim
+++ b/sources_non_forked/vim-gitgutter/autoload/gitgutter/highlight.vim
@@ -109,8 +109,8 @@ function! gitgutter#highlight#define_highlights() abort
   highlight default link GitGutterChangeDeleteLineNr CursorLineNr
 
   " Highlights used intra line.
-  highlight GitGutterAddIntraLine    gui=reverse cterm=reverse
-  highlight GitGutterDeleteIntraLine gui=reverse cterm=reverse
+  highlight default GitGutterAddIntraLine    gui=reverse cterm=reverse
+  highlight default GitGutterDeleteIntraLine gui=reverse cterm=reverse
   " Set diff syntax colours (used in the preview window) - diffAdded,diffChanged,diffRemoved -
   " to match the signs, if not set aleady.
   for [dtype,type] in [['Added','Add'], ['Changed','Change'], ['Removed','Delete']]
diff --git a/sources_non_forked/vim-gitgutter/doc/gitgutter.txt b/sources_non_forked/vim-gitgutter/doc/gitgutter.txt
index 7da0b49b..c8d0daa1 100644
--- a/sources_non_forked/vim-gitgutter/doc/gitgutter.txt
+++ b/sources_non_forked/vim-gitgutter/doc/gitgutter.txt
@@ -608,6 +608,26 @@ For example, to use |hl-Underlined| instead of |hl-CursorLineNr|:
 >
     highlight link GitGutterChangeLineNr Underlined
 <
+To change the diff syntax colours used in the preview window, set up the diff*
+highlight groups in your colorscheme or |vimrc|:
+>
+    diffAdded   " if not set: use GitGutterAdd's foreground colour
+    diffChanged " if not set: use GitGutterChange's foreground colour
+    diffRemoved " if not set: use GitGutterDelete's foreground colour
+<
+Note the diff* highlight groups are used in any buffer whose 'syntax' is
+"diff".
+
+To change the intra-line diff highlights used in the preview window, set up
+the following highlight groups in your colorscheme or |vimrc|:
+>
+    GitGutterAddIntraLine    " default: gui=reverse cterm=reverse
+    GitGutterDeleteIntraLine " default: gui=reverse cterm=reverse
+<
+For example, to use |hl-DiffAdd| for intra-line added regions:
+>
+    highlight link GitGutterAddIntraLine DiffAdd
+<
 
 
 ===============================================================================
diff --git a/sources_non_forked/vim-gitgutter/plugin/gitgutter.vim b/sources_non_forked/vim-gitgutter/plugin/gitgutter.vim
index 915c83fe..152e8d83 100644
--- a/sources_non_forked/vim-gitgutter/plugin/gitgutter.vim
+++ b/sources_non_forked/vim-gitgutter/plugin/gitgutter.vim
@@ -296,8 +296,8 @@ augroup gitgutter
   autocmd ColorScheme * call gitgutter#highlight#define_highlights()
 
   " Disable during :vimgrep
-  autocmd QuickFixCmdPre  *vimgrep* let g:gitgutter_enabled = 0
-  autocmd QuickFixCmdPost *vimgrep* let g:gitgutter_enabled = 1
+  autocmd QuickFixCmdPre  *vimgrep* let [g:gitgutter_was_enabled, g:gitgutter_enabled] = [g:gitgutter_enabled, 0]
+  autocmd QuickFixCmdPost *vimgrep* let g:gitgutter_enabled = g:gitgutter_was_enabled | unlet g:gitgutter_was_enabled
 augroup END
 
 " }}}
diff --git a/sources_non_forked/vim-javascript/indent/javascript.vim b/sources_non_forked/vim-javascript/indent/javascript.vim
index b759f0a8..b754e282 100644
--- a/sources_non_forked/vim-javascript/indent/javascript.vim
+++ b/sources_non_forked/vim-javascript/indent/javascript.vim
@@ -19,7 +19,7 @@ setlocal indentkeys+=0],0)
 "       "+norm! gg=G" '+%print' '+:q!' testfile.js \
 "       | diff -uBZ testfile.js -
 
-let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys< lisp<'
 
 " Only define the function once.
 if exists('*GetJavascriptIndent')
diff --git a/sources_non_forked/vim-multiple-cursors/Gemfile.lock b/sources_non_forked/vim-multiple-cursors/Gemfile.lock
index 5e909c4a..e833b243 100644
--- a/sources_non_forked/vim-multiple-cursors/Gemfile.lock
+++ b/sources_non_forked/vim-multiple-cursors/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    rake (12.3.3)
+    rake (10.4.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
diff --git a/sources_non_forked/vim-rhubarb/LICENSE b/sources_non_forked/vim-rhubarb/LICENSE
new file mode 100644
index 00000000..859b594b
--- /dev/null
+++ b/sources_non_forked/vim-rhubarb/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) Tim Pope
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/sources_non_forked/vim-rhubarb/autoload/rhubarb.vim b/sources_non_forked/vim-rhubarb/autoload/rhubarb.vim
new file mode 100644
index 00000000..584185c5
--- /dev/null
+++ b/sources_non_forked/vim-rhubarb/autoload/rhubarb.vim
@@ -0,0 +1,330 @@
+" Location: autoload/rhubarb.vim
+" Author: Tim Pope <http://tpo.pe/>
+
+if exists('g:autoloaded_rhubarb')
+  finish
+endif
+let g:autoloaded_rhubarb = 1
+
+" Section: Utility
+
+function! s:throw(string) abort
+  let v:errmsg = 'rhubarb: '.a:string
+  throw v:errmsg
+endfunction
+
+function! s:shellesc(arg) abort
+  if a:arg =~# '^[A-Za-z0-9_/.-]\+$'
+    return a:arg
+  elseif &shell =~# 'cmd' && a:arg !~# '"'
+    return '"'.a:arg.'"'
+  else
+    return shellescape(a:arg)
+  endif
+endfunction
+
+function! rhubarb#HomepageForUrl(url) abort
+  let dict_or_list = get(g:, 'github_enterprise_urls', get(g:, 'fugitive_github_domains', {}))
+  if type(dict_or_list) ==# type({})
+    let domains = dict_or_list
+  elseif type(dict_or_list) == type([])
+    let domains = {}
+    for domain in dict_or_list
+      let domains[substitute(domain, '^.\{-\}://', '', '')] = domain
+    endfor
+  else
+    let domains = {}
+  endif
+  " [full_url, scheme, host_with_port, host, path]
+  if a:url =~# '://'
+    let match = matchlist(a:url, '^\(https\=://\|git://\|ssh://\)\%([^@/]\+@\)\=\(\([^/:]\+\)\%(:\d\+\)\=\)/\(.\{-\}\)\%(\.git\)\=/\=$')
+  else
+    let match = matchlist(a:url, '^\([^@/]\+@\)\=\(\([^:/]\+\)\):\(.\{-\}\)\%(\.git\)\=/\=$')
+    if !empty(match)
+      let match[1] = 'ssh://'
+    endif
+  endif
+  if empty(match)
+    return ''
+  elseif match[3] ==# 'github.com' || match[3] ==# 'ssh.github.com'
+    return 'https://github.com/' . match[4]
+  elseif has_key(domains, match[1] . match[2])
+    let key = match[1] . match[2]
+  elseif has_key(domains, match[2])
+    let key = match[2]
+  elseif has_key(domains, match[3])
+    let key = match[3]
+  else
+    return ''
+  endif
+  let root = domains[key]
+  if type(root) !=# type('') && root
+    let root = key
+  endif
+  if empty(root)
+    return ''
+  elseif root !~# '://'
+    let root = (match[1] =~# '^http://' ? 'http://' : 'https://') . root
+  endif
+  return substitute(root, '/$', '', '') . '/' . match[4]
+endfunction
+
+function! rhubarb#homepage_for_url(url) abort
+  return rhubarb#HomepageForUrl(a:url)
+endfunction
+
+function! s:repo_homepage() abort
+  if exists('b:rhubarb_homepage')
+    return b:rhubarb_homepage
+  endif
+  let remote = FugitiveRemoteUrl()
+  let homepage = rhubarb#HomepageForUrl(remote)
+  if !empty(homepage)
+    let b:rhubarb_homepage = homepage
+    return b:rhubarb_homepage
+  endif
+  call s:throw((len(remote) ? remote : 'origin') . ' is not a GitHub repository')
+endfunction
+
+" Section: HTTP
+
+function! s:credentials() abort
+  if !exists('g:github_user')
+    let g:github_user = $GITHUB_USER
+    if g:github_user ==# '' && exists('*FugitiveConfigGet')
+      let g:github_user = FugitiveConfigGet('github.user', '')
+    endif
+    if g:github_user ==# ''
+      let g:github_user = $LOGNAME
+    endif
+  endif
+  if !exists('g:github_password')
+    let g:github_password = $GITHUB_PASSWORD
+    if g:github_password ==# '' && exists('*FugitiveConfigGet')
+      let g:github_password = FugitiveConfigGet('github.password', '')
+    endif
+  endif
+  return g:github_user.':'.g:github_password
+endfunction
+
+function! rhubarb#JsonDecode(string) abort
+  if exists('*json_decode')
+    return json_decode(a:string)
+  endif
+  let [null, false, true] = ['', 0, 1]
+  let stripped = substitute(a:string,'\C"\(\\.\|[^"\\]\)*"','','g')
+  if stripped !~# "[^,:{}\\[\\]0-9.\\-+Eaeflnr-u \n\r\t]"
+    try
+      return eval(substitute(a:string,"[\r\n]"," ",'g'))
+    catch
+    endtry
+  endif
+  call s:throw("invalid JSON: ".a:string)
+endfunction
+
+function! rhubarb#JsonEncode(object) abort
+  if exists('*json_encode')
+    return json_encode(a:object)
+  endif
+  if type(a:object) == type('')
+    return '"' . substitute(a:object, "[\001-\031\"\\\\]", '\=printf("\\u%04x", char2nr(submatch(0)))', 'g') . '"'
+  elseif type(a:object) == type([])
+    return '['.join(map(copy(a:object), 'rhubarb#JsonEncode(v:val)'),', ').']'
+  elseif type(a:object) == type({})
+    let pairs = []
+    for key in keys(a:object)
+      call add(pairs, rhubarb#JsonEncode(key) . ': ' . rhubarb#JsonEncode(a:object[key]))
+    endfor
+    return '{' . join(pairs, ', ') . '}'
+  else
+    return string(a:object)
+  endif
+endfunction
+
+function! s:curl_arguments(path, ...) abort
+  let options = a:0 ? a:1 : {}
+  let args = ['curl', '-q', '--silent']
+  call extend(args, ['-H', 'Accept: application/json'])
+  call extend(args, ['-H', 'Content-Type: application/json'])
+  call extend(args, ['-A', 'rhubarb.vim'])
+  if get(options, 'auth', '') =~# ':'
+    call extend(args, ['-u', options.auth])
+  elseif has_key(options, 'auth')
+    call extend(args, ['-H', 'Authorization: bearer ' . options.auth])
+  elseif exists('g:RHUBARB_TOKEN')
+    call extend(args, ['-H', 'Authorization: bearer ' . g:RHUBARB_TOKEN])
+  elseif s:credentials() !~# '^[^:]*:$'
+    call extend(args, ['-u', s:credentials()])
+  elseif has('win32') && filereadable(expand('~/.netrc'))
+    call extend(args, ['--netrc-file', expand('~/.netrc')])
+  else
+    call extend(args, ['--netrc'])
+  endif
+  if has_key(options, 'method')
+    call extend(args, ['-X', toupper(options.method)])
+  endif
+  for header in get(options, 'headers', [])
+    call extend(args, ['-H', header])
+  endfor
+  if type(get(options, 'data', '')) != type('')
+    call extend(args, ['-d', rhubarb#JsonEncode(options.data)])
+  elseif has_key(options, 'data')
+    call extend(args, ['-d', options.data])
+  endif
+  call add(args, a:path)
+  return args
+endfunction
+
+function! rhubarb#Request(path, ...) abort
+  if !executable('curl')
+    call s:throw('cURL is required')
+  endif
+  if a:path =~# '://'
+    let path = a:path
+  elseif a:path =~# '^/'
+    let path = 'https://api.github.com' . a:path
+  else
+    let base = s:repo_homepage()
+    let path = substitute(a:path, '%s', matchstr(base, '[^/]\+/[^/]\+$'), '')
+    if base =~# '//github\.com/'
+      let path = 'https://api.github.com/' . path
+    else
+      let path = substitute(base, '[^/]\+/[^/]\+$', 'api/v3/', '') . path
+    endif
+  endif
+  let options = a:0 ? a:1 : {}
+  let args = s:curl_arguments(path, options)
+  if exists('*FugitiveExecute') && v:version >= 800
+    try
+      if has_key(options, 'callback')
+        return FugitiveExecute({'argv': args}, { r -> r.exit_status || r.stdout ==# [''] ? '' : options.callback(json_decode(join(r.stdout, ' '))) })
+      endif
+      let raw = join(FugitiveExecute({'argv': args}).stdout, ' ')
+      return empty(raw) ? raw : json_decode(raw)
+    catch /^fugitive:/
+    endtry
+  endif
+  let raw = system(join(map(copy(args), 's:shellesc(v:val)'), ' '))
+  if has_key(options, 'callback')
+    if !v:shell_error && !empty(raw)
+      call options.callback(rhubarb#JsonDecode(raw))
+    endif
+    return {}
+  endif
+  if raw ==# ''
+    return raw
+  else
+    return rhubarb#JsonDecode(raw)
+  endif
+endfunction
+
+function! rhubarb#request(...) abort
+  return call('rhubarb#Request', a:000)
+endfunction
+
+function! rhubarb#RepoRequest(...) abort
+  return rhubarb#Request('repos/%s' . (a:0 && a:1 !=# '' ? '/' . a:1 : ''), a:0 > 1 ? a:2 : {})
+endfunction
+
+function! rhubarb#repo_request(...) abort
+  return call('rhubarb#RepoRequest', a:000)
+endfunction
+
+function! s:url_encode(str) abort
+  return substitute(a:str, '[?@=&<>%#/:+[:space:]]', '\=submatch(0)==" "?"+":printf("%%%02X", char2nr(submatch(0)))', 'g')
+endfunction
+
+function! rhubarb#RepoSearch(type, q, ...) abort
+  return call('rhubarb#Request', ['search/'.a:type.'?per_page=100&q=repo:%s'.s:url_encode(' '.a:q)] + a:000)
+endfunction
+
+function! rhubarb#repo_search(...) abort
+  return call('rhubarb#RepoSearch', a:000)
+endfunction
+
+" Section: Issues
+
+let s:reference = '\<\%(\c\%(clos\|resolv\|referenc\)e[sd]\=\|\cfix\%(e[sd]\)\=\)\>'
+function! rhubarb#Complete(findstart, base) abort
+  if a:findstart
+    let existing = matchstr(getline('.')[0:col('.')-1],s:reference.'\s\+\zs[^#/,.;]*$\|[#@[:alnum:]-]*$')
+    return col('.')-1-strlen(existing)
+  endif
+  try
+    if a:base =~# '^@'
+      return map(rhubarb#RepoRequest('collaborators'), '"@".v:val.login')
+    else
+      if a:base =~# '^#'
+        let prefix = '#'
+        let query = ''
+      else
+        let prefix = s:repo_homepage().'/issues/'
+        let query = a:base
+      endif
+      let response = rhubarb#RepoSearch('issues', 'state:open '.query)
+      if type(response) != type({})
+        call s:throw('unknown error')
+      elseif has_key(response, 'message')
+        call s:throw(response.message)
+      else
+        let issues = get(response, 'items', [])
+      endif
+      return map(issues, '{"word": prefix.v:val.number, "abbr": "#".v:val.number, "menu": v:val.title, "info": substitute(empty(v:val.body) ? "\n" : v:val.body,"\\r","","g")}')
+    endif
+  catch /^rhubarb:.*is not a GitHub repository/
+    return []
+  catch /^\%(fugitive\|rhubarb\):/
+    echoerr v:errmsg
+  endtry
+endfunction
+
+function! rhubarb#omnifunc(findstart, base) abort
+  return rhubarb#Complete(a:findstart, a:base)
+endfunction
+
+" Section: Fugitive :GBrowse support
+
+function! rhubarb#FugitiveUrl(...) abort
+  if a:0 == 1 || type(a:1) == type({})
+    let opts = a:1
+    let root = rhubarb#HomepageForUrl(get(opts, 'remote', ''))
+  else
+    return ''
+  endif
+  if empty(root)
+    return ''
+  endif
+  let path = substitute(opts.path, '^/', '', '')
+  if path =~# '^\.git/refs/heads/'
+    return root . '/commits/' . path[16:-1]
+  elseif path =~# '^\.git/refs/tags/'
+    return root . '/releases/tag/' . path[15:-1]
+  elseif path =~# '^\.git/refs/remotes/[^/]\+/.'
+    return root . '/commits/' . matchstr(path,'remotes/[^/]\+/\zs.*')
+  elseif path =~# '^\.git/\%(config$\|hooks\>\)'
+    return root . '/admin'
+  elseif path =~# '^\.git\>'
+    return root
+  endif
+  let commit = opts.commit
+  if get(opts, 'type', '') ==# 'tree' || opts.path =~# '/$'
+    let url = substitute(root . '/tree/' . commit . '/' . path, '/$', '', 'g')
+  elseif get(opts, 'type', '') ==# 'blob' || opts.path =~# '[^/]$'
+    let escaped_commit = substitute(commit, '#', '%23', 'g')
+    let url = root . '/blob/' . escaped_commit . '/' . path
+    if get(opts, 'line2') > 0 && get(opts, 'line1') == opts.line2
+      let url .= '#L' . opts.line1
+    elseif get(opts, 'line1') > 0 && get(opts, 'line2') > 0
+      let url .= '#L' . opts.line1 . '-L' . opts.line2
+    endif
+  else
+    let url = root . '/commit/' . commit
+  endif
+  return url
+endfunction
+
+function! rhubarb#fugitive_url(...) abort
+  return call('rhubarb#FugitiveUrl', a:000)
+endfunction
+
+" Section: End
diff --git a/sources_non_forked/vim-rhubarb/doc/rhubarb.txt b/sources_non_forked/vim-rhubarb/doc/rhubarb.txt
new file mode 100644
index 00000000..0a1d4d0c
--- /dev/null
+++ b/sources_non_forked/vim-rhubarb/doc/rhubarb.txt
@@ -0,0 +1,17 @@
+*rhubarb.txt*  fugitive.vim extension for GitHub
+
+Author:  Tim Pope <http://tpo.pe/>
+License: MIT
+
+Use |i_CTRL-X_CTRL-O| to omni-complete GitHub issues or project collaborator
+usernames when editing a commit message.
+
+Use Fugitive's |:GBrowse| to browse to the GitHub URL for the current buffer.
+
+ABOUT                                           *rhubarb-about*
+
+Grab the latest version or report a bug on GitHub:
+
+http://github.com/tpope/vim-rhubarb
+
+ vim:tw=78:et:ft=help:norl:
diff --git a/sources_non_forked/vim-rhubarb/plugin/rhubarb.vim b/sources_non_forked/vim-rhubarb/plugin/rhubarb.vim
new file mode 100644
index 00000000..8d82f026
--- /dev/null
+++ b/sources_non_forked/vim-rhubarb/plugin/rhubarb.vim
@@ -0,0 +1,53 @@
+" rhubarb.vim - fugitive.vim extension for GitHub
+" Maintainer:   Tim Pope <http://tpo.pe/>
+
+if exists("g:loaded_rhubarb") || v:version < 700 || &cp
+  finish
+endif
+let g:loaded_rhubarb = 1
+
+if !exists('g:dispatch_compilers')
+  let g:dispatch_compilers = {}
+endif
+let g:dispatch_compilers['hub'] = 'git'
+
+function! s:SetUpMessage(filename) abort
+  if &omnifunc !~# '^\%(syntaxcomplete#Complete\)\=$' ||
+        \ a:filename !~# '\.git[\/].*MSG$' ||
+        \ !exists('*FugitiveFind')
+    return
+  endif
+  let dir = exists('*FugitiveConfigGetRegexp') ? FugitiveGitDir() : FugitiveExtractGitDir(a:filename)
+  if empty(dir)
+    return
+  endif
+  let config_file = FugitiveFind('.git/config', dir)
+  let config = filereadable(config_file) ? readfile(config_file) : []
+  if !empty(filter(config,
+        \ '!empty(rhubarb#HomepageForUrl(matchstr(v:val, ''^\s*url\s*=\s*"\=\zs[^[:space:]"]*'')))'))
+    setlocal omnifunc=rhubarb#Complete
+  endif
+endfunction
+
+augroup rhubarb
+  autocmd!
+  if exists('+omnifunc')
+    autocmd FileType gitcommit call s:SetUpMessage(expand('<afile>:p'))
+  endif
+  autocmd BufEnter *
+        \ if expand('%') ==# '' && &previewwindow && pumvisible() && getbufvar('#', '&omnifunc') ==# 'rhubarb#omnifunc' |
+        \    setlocal nolist linebreak filetype=markdown |
+        \ endif
+  autocmd BufNewFile,BufRead *.git/{PULLREQ_EDIT,ISSUE_EDIT,RELEASE_EDIT}MSG
+        \ if &ft ==# '' || &ft ==# 'conf' |
+        \   set ft=gitcommit |
+        \ endif
+augroup END
+
+if !exists('g:fugitive_browse_handlers')
+  let g:fugitive_browse_handlers = []
+endif
+
+if index(g:fugitive_browse_handlers, function('rhubarb#FugitiveUrl')) < 0
+  call insert(g:fugitive_browse_handlers, function('rhubarb#FugitiveUrl'))
+endif
diff --git a/sources_non_forked/vim-ruby/ftdetect/ruby_extra.vim b/sources_non_forked/vim-ruby/ftdetect/ruby_extra.vim
index 68e1567a..b1a9b883 100644
--- a/sources_non_forked/vim-ruby/ftdetect/ruby_extra.vim
+++ b/sources_non_forked/vim-ruby/ftdetect/ruby_extra.vim
@@ -33,6 +33,9 @@ au BufNewFile,BufRead Podfile,*.podspec		call s:setf('ruby')
 " Guard
 au BufNewFile,BufRead Guardfile,.Guardfile	call s:setf('ruby')
 
+" Jb
+au BufNewFile,BufRead *.jb			call s:setf('ruby')
+
 " Jbuilder
 au BufNewFile,BufRead *.jbuilder		call s:setf('ruby')
 
diff --git a/sources_non_forked/vim-ruby/indent/ruby.vim b/sources_non_forked/vim-ruby/indent/ruby.vim
index 20a6f7df..4b55e409 100644
--- a/sources_non_forked/vim-ruby/indent/ruby.vim
+++ b/sources_non_forked/vim-ruby/indent/ruby.vim
@@ -283,7 +283,7 @@ function! GetRubyIndent(...) abort
         \ ]
 
   " Most Significant line based on the previous one -- in case it's a
-  " contination of something above
+  " continuation of something above
   let indent_info.plnum_msl = s:GetMSL(indent_info.plnum)
 
   for callback_name in indent_callback_names
diff --git a/sources_non_forked/vim-ruby/spec/syntax/comments_spec.rb b/sources_non_forked/vim-ruby/spec/syntax/comments_spec.rb
index 0e3da0e4..78ad5728 100644
--- a/sources_non_forked/vim-ruby/spec/syntax/comments_spec.rb
+++ b/sources_non_forked/vim-ruby/spec/syntax/comments_spec.rb
@@ -40,6 +40,12 @@ describe "Syntax highlighting" do
     EOF
   end
 
+  specify "magic comments - shareable_constant_value" do
+    assert_correct_highlighting <<~'EOF', 'shareable_constant_value', 'rubyMagicComment'
+      # shareable_constant_value: literal
+    EOF
+  end
+
   specify "TODO comments" do
     assert_correct_highlighting <<~'EOF', 'TODO', 'rubyTodo'
       # TODO: turn off the oven
diff --git a/sources_non_forked/vim-ruby/syntax/ruby.vim b/sources_non_forked/vim-ruby/syntax/ruby.vim
index 193e78f6..6e720736 100644
--- a/sources_non_forked/vim-ruby/syntax/ruby.vim
+++ b/sources_non_forked/vim-ruby/syntax/ruby.vim
@@ -429,9 +429,10 @@ endif
 " Comments and Documentation {{{1
 syn match   rubySharpBang    "\%^#!.*" display
 syn keyword rubyTodo	     FIXME NOTE TODO OPTIMIZE HACK REVIEW XXX todo contained
-syn match   rubyEncoding     "[[:alnum:]-]\+" contained display
+syn match   rubyEncoding     "[[:alnum:]-_]\+" contained display
 syn match   rubyMagicComment "\c\%<3l#\s*\zs\%(coding\|encoding\):"					contained nextgroup=rubyEncoding skipwhite
 syn match   rubyMagicComment "\c\%<10l#\s*\zs\%(frozen_string_literal\|warn_indent\|warn_past_scope\):" contained nextgroup=rubyBoolean  skipwhite
+syn match   rubyMagicComment "\c\%<10l#\s*\zs\%(shareable_constant_value\):"				contained nextgroup=rubyEncoding  skipwhite
 syn match   rubyComment	     "#.*" contains=@rubyCommentSpecial,rubySpaceError,@Spell
 
 syn cluster rubyCommentSpecial contains=rubySharpBang,rubyTodo,rubyMagicComment
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
index 292a8ce9..0a956a6f 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
@@ -157,4 +157,69 @@ endsnippet
 snippet imp "import"
 import ${2} from ${1}
 endsnippet
+
+# Debugging
+snippet de
+debugger`!p snip.rv = semi(snip)`
+endsnippet
+snippet cl "console.log"
+console.log(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cd "console.debug"
+console.debug(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet ce "console.error"
+console.error(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cw "console.warn"
+console.warn(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet ci "console.info"
+console.info(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet ct "console.trace"
+console.trace(${0:label})`!p snip.rv = semi(snip)`
+endsnippet
+snippet ctime "console.time ... console.timeEnd"
+console.time("${1:label}")`!p snip.rv = semi(snip)`
+${0:${VISUAL}}
+console.timeEnd("$1")`!p snip.rv = semi(snip)`
+endsnippet
+snippet ctimestamp "console.timeStamp"
+console.timeStamp("${1:label}")`!p snip.rv = semi(snip)`
+endsnippet
+snippet ca "console.assert"
+console.assert(${1:expression}, ${0:obj})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cclear "console.clear"
+console.clear()`!p snip.rv = semi(snip)`
+endsnippet
+snippet cdir "console.dir"
+console.dir(${0:obj})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cdirx "console.dirxml"
+console.dirxml(${1:object})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cgroup "console.group"
+console.group("${1:label}")`!p snip.rv = semi(snip)`
+${0:${VISUAL}}
+console.groupEnd()`!p snip.rv = semi(snip)`
+endsnippet
+snippet cgroupc "console.groupCollapsed"
+console.groupCollapsed("${1:label}")`!p snip.rv = semi(snip)`
+${0:${VISUAL}}
+console.groupEnd()`!p snip.rv = semi(snip)`
+endsnippet
+snippet cprof "console.profile"
+console.profile("${1:label}")`!p snip.rv = semi(snip)`
+${0:${VISUAL}}
+console.profileEnd()`!p snip.rv = semi(snip)`
+endsnippet
+snippet ctable "console.table"
+console.table(${1:"${2:value}"})`!p snip.rv = semi(snip)`
+endsnippet
+snippet clstr "console.log stringified"
+console.log(JSON.stringify(${0}, null, 2))`!p snip.rv = semi(snip)`
+endsnippet
+
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets b/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
index 1017c801..a97135a6 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
@@ -112,12 +112,12 @@ snippet img "Image"
 endsnippet
 
 snippet ilc "Inline Code" i
-\`$1\`$0
+\`${1:${VISUAL}}\`$0
 endsnippet
 
 snippet cbl "Codeblock" b
-\`\`\`
-$1
+\`\`\`$1
+${2:${VISUAL}}
 \`\`\`
 $0
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
index 4923af5c..c4afcdc9 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
@@ -10,6 +10,17 @@ snippet #! "#!/usr/bin/env python" b
 $0
 endsnippet
 
+snippet #!2 "#!/usr/bin/env python2" b
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+$0
+endsnippet
+
+snippet #!3 "#!/usr/bin/env python3" b
+#!/usr/bin/env python3
+$0
+endsnippet
+
 snippet "^# ?[uU][tT][fF]-?8" "# encoding: UTF-8" r
 # -*- coding: utf-8 -*-
 $0
@@ -73,7 +84,23 @@ class Arg(object):
 
 
 def get_args(arglist):
-	args = [Arg(arg) for arg in arglist.split(',') if arg]
+	args = []
+	n = len(arglist)
+	i = 0
+	while i < n:
+		l_bracket = 0
+		start = i
+		while i < n and (l_bracket > 0 or arglist[i] != ','):
+			if arglist[i] == '[':
+				l_bracket += 1
+			elif arglist[i] == ']' and l_bracket > 0:
+				l_bracket -= 1
+			i += 1
+		arg = arglist[start:i]
+		if arg:
+			args.append(Arg(arg))
+		i += 1
+
 	args = [arg for arg in args if arg.name != 'self']
 
 	return args
diff --git a/sources_non_forked/vim-snippets/snippets/c.snippets b/sources_non_forked/vim-snippets/snippets/c.snippets
index e70d057c..2af81e86 100644
--- a/sources_non_forked/vim-snippets/snippets/c.snippets
+++ b/sources_non_forked/vim-snippets/snippets/c.snippets
@@ -334,6 +334,33 @@ snippet getopt
 			${0}
 		}
 	}
+
+## Assertions
+snippet asr
+	assert(${1:condition});
+
+snippet anl
+	assert(${1:ptr} != NULL);
+
+## Dynamic Allocation
+snippet mlc
+	${1:ptr} = (${2:type}*) malloc(sizeof($2));
+
+snippet clc
+	${1:ptr} = (${2:type}*) calloc(${3:size}, sizeof($2));
+
+snippet rlc
+	${1:ptr} = realloc($1, ${2:size} * sizeof(${3:type}));
+
+snippet mlcd
+	${1:type} ${2:ptr} = ($1*) malloc(sizeof($1));
+
+snippet clcd
+	${1:type} ${2:ptr} = ($1*) calloc(${3:size}, sizeof($1));
+
+snippet fre
+	free(${1:ptr});
+
 ##
 # TODO section
 snippet todo
diff --git a/sources_non_forked/vim-snippets/snippets/go.snippets b/sources_non_forked/vim-snippets/snippets/go.snippets
index 202b7e80..722e82fd 100644
--- a/sources_non_forked/vim-snippets/snippets/go.snippets
+++ b/sources_non_forked/vim-snippets/snippets/go.snippets
@@ -274,7 +274,7 @@ snippet ja "Marshalable json alias"
 	}
 
 
-snippet errwr "Error handling with errors.Wrap"
+snippet errwr "Error handling with fmt.Errorf"
 	if ${1}err != nil {
-		return errors.Wrap(err, "${2}")
+		return fmt.Errorf("${2} %w", err)
 	}
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets
index 489e0abb..52a2ba4c 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets
@@ -5,7 +5,7 @@ snippet ex
 	module.exports = ${1};
 # require
 snippet re
-	${1:const} ${2} = require('${3:module_name}');
+	const ${1} = require('${2:module_name}');
 # EventEmitter
 snippet on
 	on('${1:event_name}', function(${2:stream}) {
diff --git a/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index 891f905f..179ce64f 100644
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -85,16 +85,15 @@ snippet adefm
 
 # New Property
 snippet property
-	def ${1:foo}():
-		doc = "${2:The $1 property.}"
-		def fget(self):
-			${3:return self._$1}
-		def fset(self, value):
-			${4:self._$1 = value}
-		def fdel(self):
-			${0:del self._$1}
-		return locals()
-	$1 = property(**$1())
+	@property
+	def ${1:foo}(self) -> ${2:type}:
+		"""${3:doc}"""
+		return self._${1:foo}
+
+	@${1:foo}.setter
+	def ${1:foo}(self, value: ${2:type}):
+		self._${1:foo} = value
+
 # Ifs
 snippet if
 	if ${1:condition}:
diff --git a/sources_non_forked/vim-snippets/snippets/tex.snippets b/sources_non_forked/vim-snippets/snippets/tex.snippets
index c1aca341..ff94f187 100644
--- a/sources_non_forked/vim-snippets/snippets/tex.snippets
+++ b/sources_non_forked/vim-snippets/snippets/tex.snippets
@@ -380,11 +380,11 @@ snippet lim limit
 
 # Partial derivative
 snippet pdv partial derivation
-	\\frac{\\partial {$1}}{\partial {$2}} {$0}
+	\\frac{\\partial {$1}}{\\partial {$2}} {$0}
 
 # Second order partial derivative
 snippet ppdv second partial derivation
-	\\frac{\partial^2 {$1}}{\partial {$2} \partial {$3}} {$0}
+	\\frac{\\partial^2 {$1}}{\\partial {$2} \\partial {$3}} {$0}
 
 # Ordinary derivative
 snippet dv derivative
@@ -416,7 +416,7 @@ snippet . dot product
 
 # Integral
 snippet int integral
-	\\int_{{$1}}^{{$2}} {$3} \: d{$4} {$5}
+	\\int_{{$1}}^{{$2}} {$3} \\: d{$4} {$0}
 
 # Right arrow
 snippet ra rightarrow