diff --git a/sources_non_forked/ale/ale_linters/ansible/ansible_lint.vim b/sources_non_forked/ale/ale_linters/ansible/ansible_lint.vim
index c4affa31..f83de01a 100755
--- a/sources_non_forked/ale/ale_linters/ansible/ansible_lint.vim
+++ b/sources_non_forked/ale/ale_linters/ansible/ansible_lint.vim
@@ -1,4 +1,4 @@
-" Author: Bjorn Neergaard <bjorn@neersighted.com>
+" Authors: Bjorn Neergaard <bjorn@neersighted.com>, Vytautas Macionis <vytautas.macionis@manomail.de>
 " Description: ansible-lint for ansible-yaml files
 
 call ale#Set('ansible_ansible_lint_executable', 'ansible-lint')
@@ -7,7 +7,7 @@ function! ale_linters#ansible#ansible_lint#GetExecutable(buffer) abort
     return ale#Var(a:buffer, 'ansible_ansible_lint_executable')
 endfunction
 
-function! ale_linters#ansible#ansible_lint#Handle(buffer, lines) abort
+function! ale_linters#ansible#ansible_lint#Handle(buffer, version, lines) abort
     for l:line in a:lines[:10]
         if match(l:line, '^Traceback') >= 0
             return [{
@@ -18,39 +18,86 @@ function! ale_linters#ansible#ansible_lint#Handle(buffer, lines) abort
         endif
     endfor
 
-    " Matches patterns line the following:
-    "
-    " test.yml:35: [EANSIBLE0002] Trailing whitespace
-    let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):?(\d+)?: \[?([[:alnum:]]+)\]? (.*)$'
+    let l:version_group = ale#semver#GTE(a:version, [5, 0, 0]) ? '>=5.0.0' : '<5.0.0'
     let l:output = []
 
-    for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        let l:code = l:match[4]
+    if '>=5.0.0' is# l:version_group
+        " Matches patterns line the following:
+        "      test.yml:3:148: syntax-check 'var' is not a valid attribute for a Play
+        "      roles/test/tasks/test.yml:8: [package-latest] [VERY_LOW] Package installs should not use latest
+        "      D:\test\tasks\test.yml:8: [package-latest] [VERY_LOW] package installs should not use latest
+        let l:pattern = '\v^(%([a-zA-Z]:)?[^:]+):(\d+):%((\d+):)? %(\[([-[:alnum:]]+)\]) %(\[([_[:alnum:]]+)\]) (.*)$'
+        let l:error_codes = { 'VERY_HIGH': 'E', 'HIGH': 'E', 'MEDIUM': 'W', 'LOW': 'W', 'VERY_LOW': 'W', 'INFO': 'I' }
 
-        if l:code is# 'EANSIBLE0002'
-        \&& !ale#Var(a:buffer, 'warn_about_trailing_whitespace')
-            " Skip warnings for trailing whitespace if the option is off.
-            continue
-        endif
+        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': l:match[2] + 0,
+                \   'col': l:match[3] + 0,
+                \   'text': l:match[6],
+                \   'code': l:match[4],
+                \   'type': l:error_codes[l:match[5]],
+                \})
+            endif
+        endfor
+    endif
 
-        if ale#path#IsBufferPath(a:buffer, l:match[1])
-            call add(l:output, {
-            \   'lnum': l:match[2] + 0,
-            \   'col': l:match[3] + 0,
-            \   'text': l:match[5],
-            \   'code': l:code,
-            \   'type': l:code[:0] is# 'E' ? 'E' : 'W',
-            \})
-        endif
-    endfor
+    if '<5.0.0' is# l:version_group
+        " Matches patterns line the following:
+        "      test.yml:35: [EANSIBLE0002] Trailing whitespace
+        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[4]
+
+            if l:code is# 'EANSIBLE0002'
+            \&& !ale#Var(a:buffer, 'warn_about_trailing_whitespace')
+                " Skip warnings for trailing whitespace if the option is off.
+                continue
+            endif
+
+            if ale#path#IsBufferPath(a:buffer, l:match[1])
+                call add(l:output, {
+                \   'lnum': l:match[2] + 0,
+                \   'col': l:match[3] + 0,
+                \   'text': l:match[5],
+                \   'code': l:code,
+                \   'type': l:code[:0] is# 'E' ? 'E' : 'W',
+                \})
+            endif
+        endfor
+    endif
 
     return l:output
 endfunction
 
+function! ale_linters#ansible#ansible_lint#GetCommand(buffer, version) abort
+    let l:commands = {
+    \   '>=5.0.0': '%e --parseable-severity -x yaml',
+    \   '<5.0.0': '%e -p %t'
+    \}
+    let l:command = ale#semver#GTE(a:version, [5, 0]) ? l:commands['>=5.0.0'] : l:commands['<5.0.0']
+
+    return l:command
+endfunction
+
 call ale#linter#Define('ansible', {
 \   'name': 'ansible_lint',
 \   'aliases': ['ansible', 'ansible-lint'],
 \   'executable': function('ale_linters#ansible#ansible_lint#GetExecutable'),
-\   'command': '%e -p %t',
-\   'callback': 'ale_linters#ansible#ansible_lint#Handle',
+\   'command': {buffer -> ale#semver#RunWithVersionCheck(
+\       buffer,
+\       ale_linters#ansible#ansible_lint#GetExecutable(buffer),
+\       '%e --version',
+\       function('ale_linters#ansible#ansible_lint#GetCommand'),
+\   )},
+\   'callback': {buffer, lines -> ale#semver#RunWithVersionCheck(
+\       buffer,
+\       ale_linters#ansible#ansible_lint#GetExecutable(buffer),
+\       '%e --version',
+\       {buffer, version -> ale_linters#ansible#ansible_lint#Handle(
+\           buffer,
+\           l:version,
+\           lines)},
+\   )},
 \})
diff --git a/sources_non_forked/ale/ale_linters/c/cppcheck.vim b/sources_non_forked/ale/ale_linters/c/cppcheck.vim
index 975ef047..28c2861f 100755
--- a/sources_non_forked/ale/ale_linters/c/cppcheck.vim
+++ b/sources_non_forked/ale/ale_linters/c/cppcheck.vim
@@ -5,15 +5,13 @@ call ale#Set('c_cppcheck_executable', 'cppcheck')
 call ale#Set('c_cppcheck_options', '--enable=style')
 
 function! ale_linters#c#cppcheck#GetCommand(buffer) abort
-    let l:cd_command = ale#handlers#cppcheck#GetCdCommand(a:buffer)
     let l:compile_commands_option = ale#handlers#cppcheck#GetCompileCommandsOptions(a:buffer)
     let l:buffer_path_include = empty(l:compile_commands_option)
     \   ? ale#handlers#cppcheck#GetBufferPathIncludeOptions(a:buffer)
     \   : ''
     let l:template = ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
 
-    return l:cd_command
-    \   . '%e -q --language=c'
+    return '%e -q --language=c'
     \   . l:template
     \   . ale#Pad(l:compile_commands_option)
     \   . ale#Pad(ale#Var(a:buffer, 'c_cppcheck_options'))
@@ -25,6 +23,7 @@ call ale#linter#Define('c', {
 \   'name': 'cppcheck',
 \   'output_stream': 'both',
 \   'executable': {b -> ale#Var(b, 'c_cppcheck_executable')},
+\   'cwd': function('ale#handlers#cppcheck#GetCwd'),
 \   'command': function('ale_linters#c#cppcheck#GetCommand'),
 \   'callback': 'ale#handlers#cppcheck#HandleCppCheckFormat',
 \})
diff --git a/sources_non_forked/ale/ale_linters/cpp/cppcheck.vim b/sources_non_forked/ale/ale_linters/cpp/cppcheck.vim
index 2578861d..eb86adf4 100755
--- a/sources_non_forked/ale/ale_linters/cpp/cppcheck.vim
+++ b/sources_non_forked/ale/ale_linters/cpp/cppcheck.vim
@@ -5,15 +5,13 @@ call ale#Set('cpp_cppcheck_executable', 'cppcheck')
 call ale#Set('cpp_cppcheck_options', '--enable=style')
 
 function! ale_linters#cpp#cppcheck#GetCommand(buffer) abort
-    let l:cd_command = ale#handlers#cppcheck#GetCdCommand(a:buffer)
     let l:compile_commands_option = ale#handlers#cppcheck#GetCompileCommandsOptions(a:buffer)
     let l:buffer_path_include = empty(l:compile_commands_option)
     \   ? ale#handlers#cppcheck#GetBufferPathIncludeOptions(a:buffer)
     \   : ''
     let l:template = ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
 
-    return l:cd_command
-    \   . '%e -q --language=c++'
+    return '%e -q --language=c++'
     \   . l:template
     \   . ale#Pad(l:compile_commands_option)
     \   . ale#Pad(ale#Var(a:buffer, 'cpp_cppcheck_options'))
@@ -25,6 +23,7 @@ call ale#linter#Define('cpp', {
 \   'name': 'cppcheck',
 \   'output_stream': 'both',
 \   'executable': {b -> ale#Var(b, 'cpp_cppcheck_executable')},
+\   'cwd': function('ale#handlers#cppcheck#GetCwd'),
 \   'command': function('ale_linters#cpp#cppcheck#GetCommand'),
 \   'callback': 'ale#handlers#cppcheck#HandleCppCheckFormat',
 \})
diff --git a/sources_non_forked/ale/ale_linters/cs/csc.vim b/sources_non_forked/ale/ale_linters/cs/csc.vim
index 308abc77..5ee3de29 100755
--- a/sources_non_forked/ale/ale_linters/cs/csc.vim
+++ b/sources_non_forked/ale/ale_linters/cs/csc.vim
@@ -3,14 +3,10 @@ call ale#Set('cs_csc_source', '')
 call ale#Set('cs_csc_assembly_path', [])
 call ale#Set('cs_csc_assemblies', [])
 
-function! s:GetWorkingDirectory(buffer) abort
-    let l:working_directory = ale#Var(a:buffer, 'cs_csc_source')
+function! ale_linters#cs#csc#GetCwd(buffer) abort
+    let l:cwd = ale#Var(a:buffer, 'cs_csc_source')
 
-    if !empty(l:working_directory)
-        return l:working_directory
-    endif
-
-    return expand('#' . a:buffer . ':p:h')
+    return !empty(l:cwd) ? l:cwd : expand('#' . a:buffer . ':p:h')
 endfunction
 
 function! ale_linters#cs#csc#GetCommand(buffer) abort
@@ -34,8 +30,7 @@ function! ale_linters#cs#csc#GetCommand(buffer) abort
 
     " The code is compiled as a module and the output is redirected to a
     " temporary file.
-    return ale#path#CdString(s:GetWorkingDirectory(a:buffer))
-    \    . 'csc /unsafe'
+    return 'csc /unsafe'
     \    . ale#Pad(ale#Var(a:buffer, 'cs_csc_options'))
     \    . ale#Pad(l:lib_option)
     \    . ale#Pad(l:r_option)
@@ -57,8 +52,7 @@ function! ale_linters#cs#csc#Handle(buffer, lines) abort
     \    '^\v([^ ]+)\s+([Cc][sS][^ ]+):\s+(.+)$',
     \]
     let l:output = []
-
-    let l:dir = s:GetWorkingDirectory(a:buffer)
+    let l:dir = ale_linters#cs#csc#GetCwd(a:buffer)
 
     for l:match in ale#util#GetMatches(a:lines, l:patterns)
         if len(l:match) > 6 && strlen(l:match[5]) > 2 && l:match[5][:1] is? 'CS'
@@ -89,6 +83,7 @@ call ale#linter#Define('cs',{
 \   'name': 'csc',
 \   'output_stream': 'stdout',
 \   'executable': 'csc',
+\   'cwd': function('ale_linters#cs#csc#GetCwd'),
 \   'command': function('ale_linters#cs#csc#GetCommand'),
 \   'callback': 'ale_linters#cs#csc#Handle',
 \   'lint_file': 1
diff --git a/sources_non_forked/ale/ale_linters/cs/mcsc.vim b/sources_non_forked/ale/ale_linters/cs/mcsc.vim
index 0e4e5667..2dd46661 100755
--- a/sources_non_forked/ale/ale_linters/cs/mcsc.vim
+++ b/sources_non_forked/ale/ale_linters/cs/mcsc.vim
@@ -3,14 +3,10 @@ call ale#Set('cs_mcsc_source', '')
 call ale#Set('cs_mcsc_assembly_path', [])
 call ale#Set('cs_mcsc_assemblies', [])
 
-function! s:GetWorkingDirectory(buffer) abort
-    let l:working_directory = ale#Var(a:buffer, 'cs_mcsc_source')
+function! ale_linters#cs#mcsc#GetCwd(buffer) abort
+    let l:cwd = ale#Var(a:buffer, 'cs_mcsc_source')
 
-    if !empty(l:working_directory)
-        return l:working_directory
-    endif
-
-    return expand('#' . a:buffer . ':p:h')
+    return !empty(l:cwd) ? l:cwd : expand('#' . a:buffer . ':p:h')
 endfunction
 
 function! ale_linters#cs#mcsc#GetCommand(buffer) abort
@@ -34,8 +30,7 @@ function! ale_linters#cs#mcsc#GetCommand(buffer) abort
 
     " The code is compiled as a module and the output is redirected to a
     " temporary file.
-    return ale#path#CdString(s:GetWorkingDirectory(a:buffer))
-    \    . 'mcs -unsafe'
+    return 'mcs -unsafe'
     \    . ale#Pad(ale#Var(a:buffer, 'cs_mcsc_options'))
     \    . ale#Pad(l:lib_option)
     \    . ale#Pad(l:r_option)
@@ -58,7 +53,7 @@ function! ale_linters#cs#mcsc#Handle(buffer, lines) abort
     \]
     let l:output = []
 
-    let l:dir = s:GetWorkingDirectory(a:buffer)
+    let l:dir = ale_linters#cs#mcsc#GetCwd(a:buffer)
 
     for l:match in ale#util#GetMatches(a:lines, l:patterns)
         if len(l:match) > 6 && strlen(l:match[5]) > 2 && l:match[5][:1] is? 'CS'
@@ -89,6 +84,7 @@ call ale#linter#Define('cs',{
 \   'name': 'mcsc',
 \   'output_stream': 'stderr',
 \   'executable': 'mcs',
+\   'cwd': function('ale_linters#cs#mcsc#GetCwd'),
 \   'command': function('ale_linters#cs#mcsc#GetCommand'),
 \   'callback': 'ale_linters#cs#mcsc#Handle',
 \   'lint_file': 1
diff --git a/sources_non_forked/ale/ale_linters/css/stylelint.vim b/sources_non_forked/ale/ale_linters/css/stylelint.vim
index 38cb0e0b..e508f392 100755
--- a/sources_non_forked/ale/ale_linters/css/stylelint.vim
+++ b/sources_non_forked/ale/ale_linters/css/stylelint.vim
@@ -11,7 +11,7 @@ endfunction
 
 call ale#linter#Define('css', {
 \   'name': 'stylelint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'css_stylelint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'css_stylelint', [
 \       'node_modules/.bin/stylelint',
 \   ])},
 \   'command': function('ale_linters#css#stylelint#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/cuda/clangd.vim b/sources_non_forked/ale/ale_linters/cuda/clangd.vim
new file mode 100644
index 00000000..bfda821b
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/cuda/clangd.vim
@@ -0,0 +1,23 @@
+" Author: Tommy Chiang <ty1208chiang@gmail.com>
+" Description: Clangd language server for CUDA (modified from Andrey
+" Melentyev's implementation for C++)
+
+call ale#Set('cuda_clangd_executable', 'clangd')
+call ale#Set('cuda_clangd_options', '')
+call ale#Set('c_build_dir', '')
+
+function! ale_linters#cuda#clangd#GetCommand(buffer) abort
+    let l:build_dir = ale#c#GetBuildDirectory(a:buffer)
+
+    return '%e'
+    \    . ale#Pad(ale#Var(a:buffer, 'cuda_clangd_options'))
+    \    . (!empty(l:build_dir) ? ' -compile-commands-dir=' . ale#Escape(l:build_dir) : '')
+endfunction
+
+call ale#linter#Define('cuda', {
+\   'name': 'clangd',
+\   'lsp': 'stdio',
+\   'executable': {b -> ale#Var(b, 'cuda_clangd_executable')},
+\   'command': function('ale_linters#cuda#clangd#GetCommand'),
+\   'project_root': function('ale#c#FindProjectRoot'),
+\})
diff --git a/sources_non_forked/ale/ale_linters/d/dmd.vim b/sources_non_forked/ale/ale_linters/d/dmd.vim
index 14461ae6..f38e812c 100755
--- a/sources_non_forked/ale/ale_linters/d/dmd.vim
+++ b/sources_non_forked/ale/ale_linters/d/dmd.vim
@@ -1,64 +1,106 @@
 " Author: w0rp <devw0rp@gmail.com>
 " Description: "dmd for D files"
 
-function! ale_linters#d#dmd#GetDUBCommand(buffer) abort
+function! s:GetDUBCommand(buffer) abort
     " If we can't run dub, then skip this command.
-    if !executable('dub')
+    if executable('dub')
         " Returning an empty string skips to the DMD command.
-        return ''
+        let l:config = ale#d#FindDUBConfig(a:buffer)
+
+        " To support older dub versions, we just change the directory to the
+        " directory where we found the dub config, and then run `dub describe`
+        " from that directory.
+        if !empty(l:config)
+            return [fnamemodify(l:config, ':h'), 'dub describe --data-list
+            \ --data=import-paths
+            \ --data=string-import-paths
+            \ --data=versions
+            \ --data=debug-versions
+            \']
+        endif
     endif
 
-    let l:dub_file = ale#d#FindDUBConfig(a:buffer)
-
-    if empty(l:dub_file)
-        return ''
-    endif
-
-    " To support older dub versions, we just change the directory to
-    " the directory where we found the dub config, and then run `dub describe`
-    " from that directory.
-    return 'cd ' . ale#Escape(fnamemodify(l:dub_file, ':h'))
-    \   . ' && dub describe --import-paths'
+    return ['', '']
 endfunction
 
 function! ale_linters#d#dmd#RunDUBCommand(buffer) abort
-    let l:command = ale_linters#d#dmd#GetDUBCommand(a:buffer)
+    let [l:cwd, l:command] = s:GetDUBCommand(a:buffer)
 
     if empty(l:command)
         " If we can't run DUB, just run DMD.
         return ale_linters#d#dmd#DMDCommand(a:buffer, [], {})
     endif
 
-    return ale#command#Run(a:buffer, l:command, function('ale_linters#d#dmd#DMDCommand'))
+    return ale#command#Run(
+    \   a:buffer,
+    \   l:command,
+    \   function('ale_linters#d#dmd#DMDCommand'),
+    \   {'cwd': l:cwd},
+    \)
 endfunction
 
 function! ale_linters#d#dmd#DMDCommand(buffer, dub_output, meta) abort
     let l:import_list = []
+    let l:str_import_list = []
+    let l:versions_list = []
+    let l:deb_versions_list = []
+    let l:list_ind = 1
+    let l:seen_line = 0
 
-    " Build a list of import paths generated from DUB, if available.
+    " Build a list of options generated from DUB, if available.
+    " DUB output each path or version on a single line.
+    " Each list is separated by a blank line.
+    " Empty list are represented by a blank line (followed and/or
+    " preceded by a separation blank line)
     for l:line in a:dub_output
+        " line still has end of line char on windows
+        let l:line = substitute(l:line, '[\r\n]*$', '', '')
+
         if !empty(l:line)
-            " The arguments must be '-Ifilename', not '-I filename'
-            call add(l:import_list, '-I' . ale#Escape(l:line))
+            if l:list_ind == 1
+                call add(l:import_list, '-I' . ale#Escape(l:line))
+            elseif l:list_ind == 2
+                call add(l:str_import_list, '-J' . ale#Escape(l:line))
+            elseif l:list_ind == 3
+                call add(l:versions_list, '-version=' . ale#Escape(l:line))
+            elseif l:list_ind == 4
+                call add(l:deb_versions_list, '-debug=' . ale#Escape(l:line))
+            endif
+
+            let l:seen_line = 1
+        elseif !l:seen_line
+            " if list is empty must skip one empty line
+            let l:seen_line = 1
+        else
+            let l:seen_line = 0
+            let l:list_ind += 1
         endif
     endfor
 
-    return 'dmd '. join(l:import_list) . ' -o- -wi -vcolumns -c %t'
+    return 'dmd ' . join(l:import_list) . ' ' .
+    \   join(l:str_import_list) . ' ' .
+    \   join(l:versions_list) . ' ' .
+    \   join(l:deb_versions_list) . ' -o- -wi -vcolumns -c %t'
 endfunction
 
 function! ale_linters#d#dmd#Handle(buffer, lines) abort
     " Matches patterns lines like the following:
     " /tmp/tmp.qclsa7qLP7/file.d(1): Error: function declaration without return type. (Note that constructors are always named 'this')
     " /tmp/tmp.G1L5xIizvB.d(8,8): Error: module weak_reference is in file 'dstruct/weak_reference.d' which cannot be read
-    let l:pattern = '^[^(]\+(\([0-9]\+\)\,\?\([0-9]*\)): \([^:]\+\): \(.\+\)'
+    let l:pattern = '\v^(\f+)\((\d+)(,(\d+))?\): (\w+): (.+)$'
     let l:output = []
+    let l:dir = expand('#' . a:buffer . ':p:h')
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
+        " If dmd was invoked with relative path, match[1] is relative, otherwise it is absolute.
+        " As we invoke dmd with the buffer path (in /tmp), this will generally be absolute already
+        let l:fname = ale#path#GetAbsPath(l:dir, l:match[1])
         call add(l:output, {
-        \   'lnum': l:match[1],
-        \   'col': l:match[2],
-        \   'type': l:match[3] is# 'Warning' ? 'W' : 'E',
-        \   'text': l:match[4],
+        \   'filename': l:fname,
+        \   'lnum': l:match[2],
+        \   'col': l:match[4],
+        \   'type': l:match[5] is# 'Warning' || l:match[5] is# 'Deprecation' ? 'W' : 'E',
+        \   'text': l:match[6],
         \})
     endfor
 
diff --git a/sources_non_forked/ale/ale_linters/desktop/desktop_file_validate.vim b/sources_non_forked/ale/ale_linters/desktop/desktop_file_validate.vim
new file mode 100644
index 00000000..5a97d315
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/desktop/desktop_file_validate.vim
@@ -0,0 +1,31 @@
+call ale#Set('desktop_desktop_file_validate_options', '')
+
+" Example matches for pattern:
+"
+" foo.desktop: warning: key "TerminalOptions" in group ...
+" foo.desktop: error: action "new-private-window" is defined, ...
+let s:pattern = '\v^(.+): ([a-z]+): (.+)$'
+
+function! ale_linters#desktop#desktop_file_validate#Handle(buffer, lines) abort
+    " The error format doesn't specify lines, so we can just put all of the
+    " errors on line 1.
+    return ale#util#MapMatches(a:lines, s:pattern, {match -> {
+    \   'lnum': 1,
+    \   'col': 1,
+    \   'type': match[2] is? 'error' ? 'E' : 'W',
+    \   'text': match[3],
+    \}})
+endfunction
+
+call ale#linter#Define('desktop', {
+\   'name': 'desktop_file_validate',
+\   'aliases': ['desktop-file-validate'],
+\   'executable': 'desktop-file-validate',
+\   'command': {b ->
+\       '%e'
+\       . ale#Pad(ale#Var(b, 'desktop_desktop_file_validate_options'))
+\       . ' %t'
+\   },
+\   'callback': 'ale_linters#desktop#desktop_file_validate#Handle',
+\   'output_stream': 'both',
+\})
diff --git a/sources_non_forked/ale/ale_linters/dockerfile/hadolint.vim b/sources_non_forked/ale/ale_linters/dockerfile/hadolint.vim
index bed87642..02b906dd 100755
--- a/sources_non_forked/ale/ale_linters/dockerfile/hadolint.vim
+++ b/sources_non_forked/ale/ale_linters/dockerfile/hadolint.vim
@@ -9,7 +9,11 @@ function! ale_linters#dockerfile#hadolint#Handle(buffer, lines) abort
     "
     " /dev/stdin:19 DL3001 Pipe chain should start with a raw value.
     " /dev/stdin:19:3 unexpected thing
+<<<<<<< HEAD
     let l:pattern = '\v^/dev/stdin:(\d+):?(\d+)? ((DL|SC)(\d+) )?((.+)?: )?(.+)$'
+=======
+    let l:pattern = '\v^%(/dev/stdin|-):(\d+):?(\d+)? ((DL|SC)(\d+) )?((.+)?: )?(.+)$'
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
@@ -92,12 +96,15 @@ endfunction
 
 function! ale_linters#dockerfile#hadolint#GetCommand(buffer) abort
     let l:command = ale_linters#dockerfile#hadolint#GetExecutable(a:buffer)
+    let l:opts = '--no-color -'
 
     if l:command is# 'docker'
-        return 'docker run --rm -i ' . ale#Var(a:buffer, 'dockerfile_hadolint_docker_image')
+        return printf('docker run --rm -i %s hadolint %s',
+        \ ale#Var(a:buffer, 'dockerfile_hadolint_docker_image'),
+        \ l:opts)
     endif
 
-    return 'hadolint -'
+    return 'hadolint ' . l:opts
 endfunction
 
 
diff --git a/sources_non_forked/ale/ale_linters/elixir/credo.vim b/sources_non_forked/ale/ale_linters/elixir/credo.vim
index 892d47b9..5c9ccb0a 100755
--- a/sources_non_forked/ale/ale_linters/elixir/credo.vim
+++ b/sources_non_forked/ale/ale_linters/elixir/credo.vim
@@ -51,6 +51,7 @@ function! ale_linters#elixir#credo#GetConfigFile() abort
     if empty(l:config_file)
         return ''
     endif
+<<<<<<< HEAD
 
     return ' --config-file ' . l:config_file
 endfunction
@@ -58,9 +59,14 @@ endfunction
 function! ale_linters#elixir#credo#GetCommand(buffer) abort
     let l:project_root = ale#handlers#elixir#FindMixUmbrellaRoot(a:buffer)
     let l:mode = ale_linters#elixir#credo#GetMode()
+=======
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 
-    return ale#path#CdString(l:project_root)
-    \ . 'mix help credo && '
+    return ' --config-file ' . l:config_file
+endfunction
+
+function! ale_linters#elixir#credo#GetCommand(buffer) abort
+    return 'mix help credo && '
     \ . 'mix credo ' . ale_linters#elixir#credo#GetMode()
     \ . ale_linters#elixir#credo#GetConfigFile()
     \ . ' --format=flycheck --read-from-stdin %s'
@@ -69,6 +75,7 @@ endfunction
 call ale#linter#Define('elixir', {
 \   'name': 'credo',
 \   'executable': 'mix',
+\   'cwd': function('ale#handlers#elixir#FindMixUmbrellaRoot'),
 \   'command': function('ale_linters#elixir#credo#GetCommand'),
 \   'callback': 'ale_linters#elixir#credo#Handle',
 \})
diff --git a/sources_non_forked/ale/ale_linters/elixir/dialyxir.vim b/sources_non_forked/ale/ale_linters/elixir/dialyxir.vim
index c7da7757..9b8a5cda 100755
--- a/sources_non_forked/ale/ale_linters/elixir/dialyxir.vim
+++ b/sources_non_forked/ale/ale_linters/elixir/dialyxir.vim
@@ -25,17 +25,10 @@ function! ale_linters#elixir#dialyxir#Handle(buffer, lines) abort
     return l:output
 endfunction
 
-function! ale_linters#elixir#dialyxir#GetCommand(buffer) abort
-    let l:project_root = ale#handlers#elixir#FindMixProjectRoot(a:buffer)
-
-    return ale#path#CdString(l:project_root)
-    \ . ' mix help dialyzer && mix dialyzer'
-endfunction
-
 call ale#linter#Define('elixir', {
 \   'name': 'dialyxir',
 \   'executable': 'mix',
-\   'command': function('ale_linters#elixir#dialyxir#GetCommand'),
+\   'cwd': function('ale#handlers#elixir#FindMixProjectRoot'),
+\   'command': 'mix help dialyzer && mix dialyzer',
 \   'callback': 'ale_linters#elixir#dialyxir#Handle',
 \})
-
diff --git a/sources_non_forked/ale/ale_linters/elixir/dogma.vim b/sources_non_forked/ale/ale_linters/elixir/dogma.vim
index 1c721158..28e7f420 100755
--- a/sources_non_forked/ale/ale_linters/elixir/dogma.vim
+++ b/sources_non_forked/ale/ale_linters/elixir/dogma.vim
@@ -29,17 +29,11 @@ function! ale_linters#elixir#dogma#Handle(buffer, lines) abort
     return l:output
 endfunction
 
-function! ale_linters#elixir#dogma#GetCommand(buffer) abort
-    let l:project_root = ale#handlers#elixir#FindMixProjectRoot(a:buffer)
-
-    return ale#path#CdString(l:project_root)
-    \ . ' mix help dogma && mix dogma %s --format=flycheck'
-endfunction
-
 call ale#linter#Define('elixir', {
 \   'name': 'dogma',
 \   'executable': 'mix',
-\   'command': function('ale_linters#elixir#dogma#GetCommand'),
+\   'cwd': function('ale#handlers#elixir#FindMixProjectRoot'),
+\   'command': 'mix help dogma && mix dogma %s --format=flycheck',
 \   'lint_file': 1,
 \   'callback': 'ale_linters#elixir#dogma#Handle',
 \})
diff --git a/sources_non_forked/ale/ale_linters/elixir/mix.vim b/sources_non_forked/ale/ale_linters/elixir/mix.vim
index abf5d0aa..948c6d36 100755
--- a/sources_non_forked/ale/ale_linters/elixir/mix.vim
+++ b/sources_non_forked/ale/ale_linters/elixir/mix.vim
@@ -30,22 +30,15 @@ function! ale_linters#elixir#mix#Handle(buffer, lines) abort
 endfunction
 
 function! ale_linters#elixir#mix#GetCommand(buffer) abort
-    let l:project_root = ale#handlers#elixir#FindMixProjectRoot(a:buffer)
-
     let l:temp_dir = ale#command#CreateDirectory(a:buffer)
 
-    let l:mix_build_path = has('win32')
-    \   ? 'set MIX_BUILD_PATH=' . ale#Escape(l:temp_dir) . ' &&'
-    \   : 'MIX_BUILD_PATH=' . ale#Escape(l:temp_dir)
-
-    return ale#path#CdString(l:project_root)
-    \ . l:mix_build_path
-    \ . ' mix compile %s'
+    return ale#Env('MIX_BUILD_PATH', l:temp_dir) . 'mix compile %s'
 endfunction
 
 call ale#linter#Define('elixir', {
 \   'name': 'mix',
 \   'executable': 'mix',
+\   'cwd': function('ale#handlers#elixir#FindMixProjectRoot'),
 \   'command': function('ale_linters#elixir#mix#GetCommand'),
 \   'callback': 'ale_linters#elixir#mix#Handle',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/ale_linters/elm/elm_ls.vim b/sources_non_forked/ale/ale_linters/elm/elm_ls.vim
index 2fa71adb..a02dbf42 100755
--- a/sources_non_forked/ale/ale_linters/elm/elm_ls.vim
+++ b/sources_non_forked/ale/ale_linters/elm/elm_ls.vim
@@ -28,7 +28,7 @@ endfunction
 call ale#linter#Define('elm', {
 \   'name': 'elm_ls',
 \   'lsp': 'stdio',
-\   'executable': {b -> ale#node#FindExecutable(b, 'elm_ls', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'elm_ls', [
 \       'node_modules/.bin/elm-language-server',
 \       'node_modules/.bin/elm-lsp',
 \       'elm-lsp'
diff --git a/sources_non_forked/ale/ale_linters/elm/make.vim b/sources_non_forked/ale/ale_linters/elm/make.vim
index 6b93257f..a7f9ea7b 100755
--- a/sources_non_forked/ale/ale_linters/elm/make.vim
+++ b/sources_non_forked/ale/ale_linters/elm/make.vim
@@ -186,24 +186,23 @@ function! ale_linters#elm#make#IsTest(buffer) abort
     endif
 endfunction
 
+function! ale_linters#elm#make#GetCwd(buffer) abort
+    let l:root_dir = ale_linters#elm#make#GetRootDir(a:buffer)
+
+    return !empty(l:root_dir) ? l:root_dir : ''
+endfunction
+
 " Return the command to execute the linter in the projects directory.
 " If it doesn't, then this will fail when imports are needed.
 function! ale_linters#elm#make#GetCommand(buffer) abort
     let l:executable = ale_linters#elm#make#GetExecutable(a:buffer)
-    let l:root_dir = ale_linters#elm#make#GetRootDir(a:buffer)
     let l:is_v19 = ale_linters#elm#make#IsVersionGte19(a:buffer)
     let l:is_using_elm_test = l:executable =~# 'elm-test$'
 
-    if empty(l:root_dir)
-        let l:dir_set_cmd = ''
-    else
-        let l:dir_set_cmd = 'cd ' . ale#Escape(l:root_dir) . ' && '
-    endif
-
     " elm-test needs to know the path of elm-make if elm isn't installed globally.
     " https://github.com/rtfeldman/node-test-runner/blob/57728f10668f2d2ab3179e7e3208bcfa9a1f19aa/README.md#--compiler
     if l:is_v19 && l:is_using_elm_test
-        let l:elm_make_executable = ale#node#FindExecutable(a:buffer, 'elm_make', ['node_modules/.bin/elm'])
+        let l:elm_make_executable = ale#path#FindExecutable(a:buffer, 'elm_make', ['node_modules/.bin/elm'])
         let l:elm_test_compiler_flag = ' --compiler ' . l:elm_make_executable . ' '
     else
         let l:elm_test_compiler_flag = ' '
@@ -213,7 +212,9 @@ function! ale_linters#elm#make#GetCommand(buffer) abort
     " a sort of flag to tell the compiler not to generate an output file,
     " which is why this is hard coded here.
     " Source: https://github.com/elm-lang/elm-compiler/blob/19d5a769b30ec0b2fc4475985abb4cd94cd1d6c3/builder/src/Generate/Output.hs#L253
-    return l:dir_set_cmd . '%e make --report=json --output=/dev/null' . l:elm_test_compiler_flag . '%t'
+    return '%e make --report=json --output=/dev/null'
+    \   . l:elm_test_compiler_flag
+    \   . '%t'
 endfunction
 
 function! ale_linters#elm#make#GetExecutable(buffer) abort
@@ -221,13 +222,13 @@ function! ale_linters#elm#make#GetExecutable(buffer) abort
     let l:is_v19 = ale_linters#elm#make#IsVersionGte19(a:buffer)
 
     if l:is_test && l:is_v19
-        return ale#node#FindExecutable(
+        return ale#path#FindExecutable(
         \   a:buffer,
         \   'elm_make',
         \   ['node_modules/.bin/elm-test', 'node_modules/.bin/elm']
         \)
     else
-        return ale#node#FindExecutable(a:buffer, 'elm_make', ['node_modules/.bin/elm'])
+        return ale#path#FindExecutable(a:buffer, 'elm_make', ['node_modules/.bin/elm'])
     endif
 endfunction
 
@@ -235,6 +236,7 @@ call ale#linter#Define('elm', {
 \   'name': 'make',
 \   'executable': function('ale_linters#elm#make#GetExecutable'),
 \   'output_stream': 'both',
+\   'cwd': function('ale_linters#elm#make#GetCwd'),
 \   'command': function('ale_linters#elm#make#GetCommand'),
 \   'callback': 'ale_linters#elm#make#Handle'
 \})
diff --git a/sources_non_forked/ale/ale_linters/go/gobuild.vim b/sources_non_forked/ale/ale_linters/go/gobuild.vim
index 1dfb6daa..5210c5a8 100755
--- a/sources_non_forked/ale/ale_linters/go/gobuild.vim
+++ b/sources_non_forked/ale/ale_linters/go/gobuild.vim
@@ -10,8 +10,7 @@ function! ale_linters#go#gobuild#GetCommand(buffer) abort
     let l:options = ale#Var(a:buffer, 'go_gobuild_options')
 
     " Run go test in local directory with relative path
-    return ale#path#BufferCdString(a:buffer)
-    \   . ale#go#EnvString(a:buffer)
+    return ale#go#EnvString(a:buffer)
     \   . ale#Var(a:buffer, 'go_go_executable') . ' test'
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . ' -c -o /dev/null ./'
@@ -50,6 +49,7 @@ call ale#linter#Define('go', {
 \   'name': 'gobuild',
 \   'aliases': ['go build'],
 \   'executable': {b -> ale#Var(b, 'go_go_executable')},
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#go#gobuild#GetCommand'),
 \   'output_stream': 'stderr',
 \   'callback': 'ale_linters#go#gobuild#Handler',
diff --git a/sources_non_forked/ale/ale_linters/go/golangci_lint.vim b/sources_non_forked/ale/ale_linters/go/golangci_lint.vim
index dd0e975a..2c4b1a4f 100755
--- a/sources_non_forked/ale/ale_linters/go/golangci_lint.vim
+++ b/sources_non_forked/ale/ale_linters/go/golangci_lint.vim
@@ -12,14 +12,12 @@ function! ale_linters#go#golangci_lint#GetCommand(buffer) abort
 
 
     if l:lint_package
-        return ale#path#BufferCdString(a:buffer)
-        \   . ale#go#EnvString(a:buffer)
+        return ale#go#EnvString(a:buffer)
         \   . '%e run '
         \   .  l:options
     endif
 
-    return ale#path#BufferCdString(a:buffer)
-    \   . ale#go#EnvString(a:buffer)
+    return ale#go#EnvString(a:buffer)
     \   . '%e run '
     \   . ale#Escape(l:filename)
     \   . ' ' . l:options
@@ -53,6 +51,7 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'golangci-lint',
 \   'executable': {b -> ale#Var(b, 'go_golangci_lint_executable')},
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#go#golangci_lint#GetCommand'),
 \   'callback': 'ale_linters#go#golangci_lint#Handler',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/ale_linters/go/gometalinter.vim b/sources_non_forked/ale/ale_linters/go/gometalinter.vim
index eed9550a..ac33a9f3 100755
--- a/sources_non_forked/ale/ale_linters/go/gometalinter.vim
+++ b/sources_non_forked/ale/ale_linters/go/gometalinter.vim
@@ -13,14 +13,12 @@ function! ale_linters#go#gometalinter#GetCommand(buffer) abort
     " BufferCdString is used so that we can be sure the paths output from gometalinter can
     " be calculated to absolute paths in the Handler
     if l:lint_package
-        return ale#path#BufferCdString(a:buffer)
-        \   . ale#go#EnvString(a:buffer)
+        return ale#go#EnvString(a:buffer)
         \   . '%e'
         \   . (!empty(l:options) ? ' ' . l:options : '') . ' .'
     endif
 
-    return ale#path#BufferCdString(a:buffer)
-    \   . ale#go#EnvString(a:buffer)
+    return ale#go#EnvString(a:buffer)
     \   . '%e'
     \   . ' --include=' . ale#Escape(ale#util#EscapePCRE(l:filename))
     \   . (!empty(l:options) ? ' ' . l:options : '') . ' .'
@@ -53,6 +51,7 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'gometalinter',
 \   'executable': {b -> ale#Var(b, 'go_gometalinter_executable')},
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#go#gometalinter#GetCommand'),
 \   'callback': 'ale_linters#go#gometalinter#Handler',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/ale_linters/go/gopls.vim b/sources_non_forked/ale/ale_linters/go/gopls.vim
index f3f1bd6b..50ef731e 100755
--- a/sources_non_forked/ale/ale_linters/go/gopls.vim
+++ b/sources_non_forked/ale/ale_linters/go/gopls.vim
@@ -5,6 +5,10 @@
 call ale#Set('go_gopls_executable', 'gopls')
 call ale#Set('go_gopls_options', '--mode stdio')
 call ale#Set('go_gopls_init_options', {})
+<<<<<<< HEAD
+=======
+call ale#Set('go_gopls_use_global', get(g:, 'ale_use_global_executables', 0))
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 
 function! ale_linters#go#gopls#GetCommand(buffer) abort
     return ale#go#EnvString(a:buffer)
@@ -29,7 +33,9 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'gopls',
 \   'lsp': 'stdio',
-\   'executable': {b -> ale#Var(b, 'go_gopls_executable')},
+\   'executable': {b -> ale#path#FindExecutable(b, 'go_gopls', [
+\       ale#go#GetGoPathExecutable('bin/gopls'),
+\   ])},
 \   'command': function('ale_linters#go#gopls#GetCommand'),
 \   'project_root': function('ale_linters#go#gopls#FindProjectRoot'),
 \   'initialization_options': {b -> ale#Var(b, 'go_gopls_init_options')},
diff --git a/sources_non_forked/ale/ale_linters/go/gosimple.vim b/sources_non_forked/ale/ale_linters/go/gosimple.vim
index ad52c621..490d15a9 100755
--- a/sources_non_forked/ale/ale_linters/go/gosimple.vim
+++ b/sources_non_forked/ale/ale_linters/go/gosimple.vim
@@ -1,15 +1,11 @@
 " Author: Ben Reedy <https://github.com/breed808>
 " Description: gosimple for Go files
 
-function! ale_linters#go#gosimple#GetCommand(buffer) abort
-    return ale#path#BufferCdString(a:buffer) . ' '
-    \   . ale#go#EnvString(a:buffer) . 'gosimple .'
-endfunction
-
 call ale#linter#Define('go', {
 \   'name': 'gosimple',
 \   'executable': 'gosimple',
-\   'command': function('ale_linters#go#gosimple#GetCommand'),
+\   'cwd': '%s:h',
+\   'command': {b -> ale#go#EnvString(b) . 'gosimple .'},
 \   'callback': 'ale#handlers#go#Handler',
 \   'output_stream': 'both',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/ale_linters/go/gotype.vim b/sources_non_forked/ale/ale_linters/go/gotype.vim
index 6a5149ca..8fd6df27 100755
--- a/sources_non_forked/ale/ale_linters/go/gotype.vim
+++ b/sources_non_forked/ale/ale_linters/go/gotype.vim
@@ -1,19 +1,23 @@
 " Author: Jelte Fennema <github-public@jeltef.nl>
 " Description: gotype for Go files
 
-function! ale_linters#go#gotype#GetCommand(buffer) abort
+function! ale_linters#go#gotype#GetExecutable(buffer) abort
     if expand('#' . a:buffer . ':p') =~# '_test\.go$'
         return ''
     endif
 
-    return ale#path#BufferCdString(a:buffer) . ' '
-    \   . ale#go#EnvString(a:buffer) . 'gotype -e .'
+    return 'gotype'
+endfunction
+
+function! ale_linters#go#gotype#GetCommand(buffer) abort
+    return ale#go#EnvString(a:buffer) . 'gotype -e .'
 endfunction
 
 call ale#linter#Define('go', {
 \   'name': 'gotype',
 \   'output_stream': 'stderr',
-\   'executable': 'gotype',
+\   'executable': function('ale_linters#go#gotype#GetExecutable'),
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#go#gotype#GetCommand'),
 \   'callback': 'ale#handlers#go#Handler',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/ale_linters/go/govet.vim b/sources_non_forked/ale/ale_linters/go/govet.vim
index dddafe17..5da8261c 100755
--- a/sources_non_forked/ale/ale_linters/go/govet.vim
+++ b/sources_non_forked/ale/ale_linters/go/govet.vim
@@ -10,8 +10,7 @@ call ale#Set('go_govet_options', '')
 function! ale_linters#go#govet#GetCommand(buffer) abort
     let l:options = ale#Var(a:buffer, 'go_govet_options')
 
-    return ale#path#BufferCdString(a:buffer) . ' '
-    \   . ale#go#EnvString(a:buffer)
+    return ale#go#EnvString(a:buffer)
     \   . ale#Var(a:buffer, 'go_go_executable') . ' vet '
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . ' .'
@@ -22,6 +21,7 @@ call ale#linter#Define('go', {
 \   'aliases': ['go vet'],
 \   'output_stream': 'stderr',
 \   'executable': {b -> ale#Var(b, 'go_go_executable')},
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#go#govet#GetCommand'),
 \   'callback': 'ale#handlers#go#Handler',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/ale_linters/go/staticcheck.vim b/sources_non_forked/ale/ale_linters/go/staticcheck.vim
index ed40c6c2..5dc88f1a 100755
--- a/sources_non_forked/ale/ale_linters/go/staticcheck.vim
+++ b/sources_non_forked/ale/ale_linters/go/staticcheck.vim
@@ -1,32 +1,32 @@
 " Author: Ben Reedy <https://github.com/breed808>
 " Description: staticcheck for Go files
 
+call ale#Set('go_staticcheck_executable', 'staticcheck')
 call ale#Set('go_staticcheck_options', '')
 call ale#Set('go_staticcheck_lint_package', 0)
+call ale#Set('go_staticcheck_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale_linters#go#staticcheck#GetCommand(buffer) abort
-    let l:filename = expand('#' . a:buffer . ':t')
     let l:options = ale#Var(a:buffer, 'go_staticcheck_options')
     let l:lint_package = ale#Var(a:buffer, 'go_staticcheck_lint_package')
     let l:env = ale#go#EnvString(a:buffer)
 
-    " BufferCdString is used so that we can be sure the paths output from
-    " staticcheck can be calculated to absolute paths in the Handler
     if l:lint_package
-        return ale#path#BufferCdString(a:buffer)
-        \   . l:env . 'staticcheck'
+        return l:env . '%e'
         \   . (!empty(l:options) ? ' ' . l:options : '') . ' .'
     endif
 
-    return ale#path#BufferCdString(a:buffer)
-    \   . l:env . 'staticcheck'
+    return l:env . '%e'
     \   . (!empty(l:options) ? ' ' . l:options : '')
-    \   . ' ' . ale#Escape(l:filename)
+    \   . ' %s:t'
 endfunction
 
 call ale#linter#Define('go', {
 \   'name': 'staticcheck',
-\   'executable': 'staticcheck',
+\   'executable': {b -> ale#path#FindExecutable(b, 'go_staticcheck', [
+\       ale#go#GetGoPathExecutable('bin/staticcheck'),
+\   ])},
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#go#staticcheck#GetCommand'),
 \   'callback': 'ale#handlers#go#Handler',
 \   'output_stream': 'both',
diff --git a/sources_non_forked/ale/ale_linters/graphql/eslint.vim b/sources_non_forked/ale/ale_linters/graphql/eslint.vim
index aed1a371..a98233e9 100755
--- a/sources_non_forked/ale/ale_linters/graphql/eslint.vim
+++ b/sources_non_forked/ale/ale_linters/graphql/eslint.vim
@@ -4,6 +4,7 @@
 call ale#linter#Define('graphql', {
 \   'name': 'eslint',
 \   '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/graphql/gqlint.vim b/sources_non_forked/ale/ale_linters/graphql/gqlint.vim
index d5029de1..6f1ca54a 100755
--- a/sources_non_forked/ale/ale_linters/graphql/gqlint.vim
+++ b/sources_non_forked/ale/ale_linters/graphql/gqlint.vim
@@ -1,15 +1,10 @@
 " Author: Michiel Westerbeek <happylinks@gmail.com>
 " Description: Linter for GraphQL Schemas
 
-function! ale_linters#graphql#gqlint#GetCommand(buffer) abort
-    return ale#path#BufferCdString(a:buffer)
-    \   . 'gqlint'
-    \   . ' --reporter=simple %t'
-endfunction
-
 call ale#linter#Define('graphql', {
 \   'name': 'gqlint',
 \   'executable': 'gqlint',
-\   'command': function('ale_linters#graphql#gqlint#GetCommand'),
+\   'cwd': '%s:h',
+\   'command': 'gqlint --reporter=simple %t',
 \   'callback': 'ale#handlers#unix#HandleAsWarning',
 \})
diff --git a/sources_non_forked/ale/ale_linters/handlebars/embertemplatelint.vim b/sources_non_forked/ale/ale_linters/handlebars/embertemplatelint.vim
index bd4d1d31..8362bb1c 100755
--- a/sources_non_forked/ale/ale_linters/handlebars/embertemplatelint.vim
+++ b/sources_non_forked/ale/ale_linters/handlebars/embertemplatelint.vim
@@ -5,7 +5,7 @@ call ale#Set('handlebars_embertemplatelint_executable', 'ember-template-lint')
 call ale#Set('handlebars_embertemplatelint_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale_linters#handlebars#embertemplatelint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'handlebars_embertemplatelint', [
+    return ale#path#FindExecutable(a:buffer, 'handlebars_embertemplatelint', [
     \   'node_modules/.bin/ember-template-lint',
     \])
 endfunction
diff --git a/sources_non_forked/ale/ale_linters/haskell/cabal_ghc.vim b/sources_non_forked/ale/ale_linters/haskell/cabal_ghc.vim
index f3f248f5..1bb31ebb 100755
--- a/sources_non_forked/ale/ale_linters/haskell/cabal_ghc.vim
+++ b/sources_non_forked/ale/ale_linters/haskell/cabal_ghc.vim
@@ -4,8 +4,7 @@
 call ale#Set('haskell_cabal_ghc_options', '-fno-code -v0')
 
 function! ale_linters#haskell#cabal_ghc#GetCommand(buffer) abort
-    return ale#path#BufferCdString(a:buffer)
-    \   . 'cabal exec -- ghc '
+    return 'cabal exec -- ghc '
     \   . ale#Var(a:buffer, 'haskell_cabal_ghc_options')
     \   . ' %t'
 endfunction
@@ -15,6 +14,7 @@ call ale#linter#Define('haskell', {
 \   'aliases': ['cabal-ghc'],
 \   'output_stream': 'stderr',
 \   'executable': 'cabal',
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#haskell#cabal_ghc#GetCommand'),
 \   'callback': 'ale#handlers#haskell#HandleGHCFormat',
 \})
diff --git a/sources_non_forked/ale/ale_linters/haskell/stack_ghc.vim b/sources_non_forked/ale/ale_linters/haskell/stack_ghc.vim
index c345fe43..51ecc744 100755
--- a/sources_non_forked/ale/ale_linters/haskell/stack_ghc.vim
+++ b/sources_non_forked/ale/ale_linters/haskell/stack_ghc.vim
@@ -4,8 +4,7 @@
 call ale#Set('haskell_stack_ghc_options', '-fno-code -v0')
 
 function! ale_linters#haskell#stack_ghc#GetCommand(buffer) abort
-    return ale#path#BufferCdString(a:buffer)
-    \ . ale#handlers#haskell#GetStackExecutable(a:buffer)
+    return ale#handlers#haskell#GetStackExecutable(a:buffer)
     \ . ' ghc -- '
     \ . ale#Var(a:buffer, 'haskell_stack_ghc_options')
     \ . ' %t'
@@ -16,6 +15,7 @@ call ale#linter#Define('haskell', {
 \   'aliases': ['stack-ghc'],
 \   'output_stream': 'stderr',
 \   'executable': function('ale#handlers#haskell#GetStackExecutable'),
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#haskell#stack_ghc#GetCommand'),
 \   'callback': 'ale#handlers#haskell#HandleGHCFormat',
 \})
diff --git a/sources_non_forked/ale/ale_linters/html/angular.vim b/sources_non_forked/ale/ale_linters/html/angular.vim
new file mode 100644
index 00000000..17c0a751
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/html/angular.vim
@@ -0,0 +1,52 @@
+" Author: w0rp <devw0rp@gmail.com>
+" Description: tsserver integration for ALE
+
+call ale#Set('html_angular_executable', 'ngserver')
+call ale#Set('html_angular_use_global', get(g:, 'ale_use_global_executables', 0))
+
+function! ale_linters#html#angular#GetProjectRoot(buffer) abort
+    return ale#path#Dirname(
+    \   ale#path#FindNearestDirectory(a:buffer, 'node_modules')
+    \)
+endfunction
+
+function! ale_linters#html#angular#GetExecutable(buffer) abort
+    return ale#path#FindExecutable(a:buffer, 'html_angular', [
+    \   'node_modules/@angular/language-server/bin/ngserver',
+    \   'node_modules/@angular/language-server/index.js',
+    \])
+endfunction
+
+function! ale_linters#html#angular#GetCommand(buffer) abort
+    let l:language_service_dir = ale#path#Simplify(
+    \   ale#path#FindNearestDirectory(
+    \       a:buffer,
+    \       'node_modules/@angular/language-service'
+    \   )
+    \)
+
+    if empty(l:language_service_dir)
+        return ''
+    endif
+
+    let l:language_service_dir = fnamemodify(l:language_service_dir, ':h')
+    let l:typescript_dir = ale#path#Simplify(
+    \   fnamemodify(l:language_service_dir, ':h:h')
+    \   . '/typescript'
+    \)
+    let l:executable = ale_linters#html#angular#GetExecutable(a:buffer)
+
+    return ale#node#Executable(a:buffer, l:executable)
+    \ . ' --ngProbeLocations ' . ale#Escape(l:language_service_dir)
+    \ . ' --tsProbeLocations ' . ale#Escape(l:typescript_dir)
+    \ . ' --stdio'
+endfunction
+
+call ale#linter#Define('html', {
+\   'name': 'angular',
+\   'aliases': ['angular-language-server'],
+\   'lsp': 'stdio',
+\   'executable': function('ale_linters#html#angular#GetExecutable'),
+\   'command': function('ale_linters#html#angular#GetCommand'),
+\   'project_root': function('ale_linters#html#angular#GetProjectRoot'),
+\})
diff --git a/sources_non_forked/ale/ale_linters/html/htmlhint.vim b/sources_non_forked/ale/ale_linters/html/htmlhint.vim
index 3e01f51a..25bf5137 100755
--- a/sources_non_forked/ale/ale_linters/html/htmlhint.vim
+++ b/sources_non_forked/ale/ale_linters/html/htmlhint.vim
@@ -24,7 +24,7 @@ endfunction
 
 call ale#linter#Define('html', {
 \   'name': 'htmlhint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'html_htmlhint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'html_htmlhint', [
 \       'node_modules/.bin/htmlhint',
 \   ])},
 \   'command': function('ale_linters#html#htmlhint#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/html/stylelint.vim b/sources_non_forked/ale/ale_linters/html/stylelint.vim
index ae8955f3..6b7aba40 100755
--- a/sources_non_forked/ale/ale_linters/html/stylelint.vim
+++ b/sources_non_forked/ale/ale_linters/html/stylelint.vim
@@ -5,7 +5,7 @@ call ale#Set('html_stylelint_options', '')
 call ale#Set('html_stylelint_use_global', 0)
 
 function! ale_linters#html#stylelint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'html_stylelint', [
+    return ale#path#FindExecutable(a:buffer, 'html_stylelint', [
     \   'node_modules/.bin/stylelint',
     \])
 endfunction
diff --git a/sources_non_forked/ale/ale_linters/ink/ls.vim b/sources_non_forked/ale/ale_linters/ink/ls.vim
index 1cc93583..00b2f323 100755
--- a/sources_non_forked/ale/ale_linters/ink/ls.vim
+++ b/sources_non_forked/ale/ale_linters/ink/ls.vim
@@ -6,7 +6,7 @@ call ale#Set('ink_ls_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('ink_ls_initialization_options', {})
 
 function! ale_linters#ink#ls#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'ink_ls', [
+    return ale#path#FindExecutable(a:buffer, 'ink_ls', [
     \   'ink-language-server',
     \   'node_modules/.bin/ink-language-server',
     \])
diff --git a/sources_non_forked/ale/ale_linters/java/javac.vim b/sources_non_forked/ale/ale_linters/java/javac.vim
index a5e57e6c..971e8de0 100755
--- a/sources_non_forked/ale/ale_linters/java/javac.vim
+++ b/sources_non_forked/ale/ale_linters/java/javac.vim
@@ -9,16 +9,16 @@ call ale#Set('java_javac_classpath', '')
 call ale#Set('java_javac_sourcepath', '')
 
 function! ale_linters#java#javac#RunWithImportPaths(buffer) abort
-    let l:command = ale#maven#BuildClasspathCommand(a:buffer)
+    let [l:cwd, l:command] = ale#maven#BuildClasspathCommand(a:buffer)
 
     " Try to use Gradle if Maven isn't available.
     if empty(l:command)
-        let l:command = ale#gradle#BuildClasspathCommand(a:buffer)
+        let [l:cwd, l:command] = ale#gradle#BuildClasspathCommand(a:buffer)
     endif
 
     " Try to use Ant if Gradle and Maven aren't available
     if empty(l:command)
-        let l:command = ale#ant#BuildClasspathCommand(a:buffer)
+        let [l:cwd, l:command] = ale#ant#BuildClasspathCommand(a:buffer)
     endif
 
     if empty(l:command)
@@ -28,7 +28,8 @@ function! ale_linters#java#javac#RunWithImportPaths(buffer) abort
     return ale#command#Run(
     \   a:buffer,
     \   l:command,
-    \   function('ale_linters#java#javac#GetCommand')
+    \   function('ale_linters#java#javac#GetCommand'),
+    \   {'cwd': l:cwd},
     \)
 endfunction
 
@@ -110,8 +111,7 @@ function! ale_linters#java#javac#GetCommand(buffer, import_paths, meta) abort
 
     " Always run javac from the directory the file is in, so we can resolve
     " relative paths correctly.
-    return ale#path#BufferCdString(a:buffer)
-    \ . '%e -Xlint'
+    return '%e -Xlint'
     \ . ale#Pad(l:cp_option)
     \ . ale#Pad(l:sp_option)
     \ . ' -d ' . ale#Escape(l:class_file_directory)
@@ -132,7 +132,9 @@ function! ale_linters#java#javac#Handle(buffer, lines) abort
 
     for l:match in ale#util#GetMatches(a:lines, [l:pattern, l:col_pattern, l:symbol_pattern])
         if empty(l:match[2]) && empty(l:match[3])
-            let l:output[-1].col = len(l:match[1])
+            if !empty(l:match[1]) && !empty(l:output)
+                let l:output[-1].col = len(l:match[1])
+            endif
         elseif empty(l:match[3])
             " Add symbols to 'cannot find symbol' errors.
             if l:output[-1].text is# 'error: cannot find symbol'
@@ -154,6 +156,7 @@ endfunction
 call ale#linter#Define('java', {
 \   'name': 'javac',
 \   'executable': {b -> ale#Var(b, 'java_javac_executable')},
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#java#javac#RunWithImportPaths'),
 \   'output_stream': 'stderr',
 \   'callback': 'ale_linters#java#javac#Handle',
diff --git a/sources_non_forked/ale/ale_linters/javascript/eslint.vim b/sources_non_forked/ale/ale_linters/javascript/eslint.vim
index 31fb413f..cf4de6ec 100755
--- a/sources_non_forked/ale/ale_linters/javascript/eslint.vim
+++ b/sources_non_forked/ale/ale_linters/javascript/eslint.vim
@@ -5,6 +5,7 @@ call ale#linter#Define('javascript', {
 \   '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/javascript/flow.vim b/sources_non_forked/ale/ale_linters/javascript/flow.vim
index 3135e2e9..601bac33 100755
--- a/sources_non_forked/ale/ale_linters/javascript/flow.vim
+++ b/sources_non_forked/ale/ale_linters/javascript/flow.vim
@@ -22,7 +22,7 @@ function! ale_linters#javascript#flow#GetExecutable(buffer) abort
         return ''
     endif
 
-    return ale#node#FindExecutable(a:buffer, 'javascript_flow', [
+    return ale#path#FindExecutable(a:buffer, 'javascript_flow', [
     \   'node_modules/.bin/flow',
     \])
 endfunction
diff --git a/sources_non_forked/ale/ale_linters/javascript/flow_ls.vim b/sources_non_forked/ale/ale_linters/javascript/flow_ls.vim
index accaaa73..fec34011 100755
--- a/sources_non_forked/ale/ale_linters/javascript/flow_ls.vim
+++ b/sources_non_forked/ale/ale_linters/javascript/flow_ls.vim
@@ -19,7 +19,7 @@ endfunction
 call ale#linter#Define('javascript', {
 \   'name': 'flow-language-server',
 \   'lsp': 'stdio',
-\   'executable': {b -> ale#node#FindExecutable(b, 'javascript_flow_ls', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'javascript_flow_ls', [
 \       'node_modules/.bin/flow',
 \   ])},
 \   'command': '%e lsp --from ale-lsp',
diff --git a/sources_non_forked/ale/ale_linters/javascript/jscs.vim b/sources_non_forked/ale/ale_linters/javascript/jscs.vim
index 8905b3a1..ae3be68c 100755
--- a/sources_non_forked/ale/ale_linters/javascript/jscs.vim
+++ b/sources_non_forked/ale/ale_linters/javascript/jscs.vim
@@ -53,7 +53,7 @@ endfunction
 
 call ale#linter#Define('javascript', {
 \   'name': 'jscs',
-\   'executable': {b -> ale#node#FindExecutable(b, 'javascript_jscs', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'javascript_jscs', [
 \       'node_modules/.bin/jscs',
 \   ])},
 \   'command': function('ale_linters#javascript#jscs#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/javascript/jshint.vim b/sources_non_forked/ale/ale_linters/javascript/jshint.vim
index d80a2250..26d4fda2 100755
--- a/sources_non_forked/ale/ale_linters/javascript/jshint.vim
+++ b/sources_non_forked/ale/ale_linters/javascript/jshint.vim
@@ -25,7 +25,7 @@ endfunction
 
 call ale#linter#Define('javascript', {
 \   'name': 'jshint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'javascript_jshint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'javascript_jshint', [
 \       'node_modules/.bin/jshint',
 \   ])},
 \   'command': function('ale_linters#javascript#jshint#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/javascript/standard.vim b/sources_non_forked/ale/ale_linters/javascript/standard.vim
index 1990adce..addf41dd 100755
--- a/sources_non_forked/ale/ale_linters/javascript/standard.vim
+++ b/sources_non_forked/ale/ale_linters/javascript/standard.vim
@@ -6,7 +6,7 @@ call ale#Set('javascript_standard_use_global', get(g:, 'ale_use_global_executabl
 call ale#Set('javascript_standard_options', '')
 
 function! ale_linters#javascript#standard#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_standard', [
+    return ale#path#FindExecutable(a:buffer, 'javascript_standard', [
     \   'node_modules/standardx/bin/cmd.js',
     \   'node_modules/standard/bin/cmd.js',
     \   'node_modules/semistandard/bin/cmd.js',
diff --git a/sources_non_forked/ale/ale_linters/javascript/tsserver.vim b/sources_non_forked/ale/ale_linters/javascript/tsserver.vim
index 68c252c5..caf6972b 100755
--- a/sources_non_forked/ale/ale_linters/javascript/tsserver.vim
+++ b/sources_non_forked/ale/ale_linters/javascript/tsserver.vim
@@ -8,7 +8,7 @@ call ale#Set('javascript_tsserver_use_global', get(g:, 'ale_use_global_executabl
 call ale#linter#Define('javascript', {
 \   'name': 'tsserver',
 \   'lsp': 'tsserver',
-\   'executable': {b -> ale#node#FindExecutable(b, 'javascript_tsserver', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'javascript_tsserver', [
 \       'node_modules/.bin/tsserver',
 \   ])},
 \   'command': '%e',
diff --git a/sources_non_forked/ale/ale_linters/json/jq.vim b/sources_non_forked/ale/ale_linters/json/jq.vim
index dd6ed0a6..1b037698 100755
--- a/sources_non_forked/ale/ale_linters/json/jq.vim
+++ b/sources_non_forked/ale/ale_linters/json/jq.vim
@@ -1,4 +1,5 @@
 " Author: jD91mZM2 <me@krake.one>
+<<<<<<< HEAD
 
 function! ale_linters#json#jq#GetCommand(buffer) abort
     let l:executable = ale#fixers#jq#GetExecutable(a:buffer)
@@ -21,12 +22,34 @@ function! ale_linters#json#jq#Handle(buffer, lines) abort
     endfor
 
     return l:output
+=======
+call ale#Set('json_jq_executable', 'jq')
+call ale#Set('json_jq_options', '')
+call ale#Set('json_jq_filters', '.')
+
+" Matches patterns like the following:
+" parse error: Expected another key-value pair at line 4, column 3
+let s:pattern = '^parse error: \(.\+\) at line \(\d\+\), column \(\d\+\)$'
+
+function! ale_linters#json#jq#Handle(buffer, lines) abort
+    return ale#util#MapMatches(a:lines, s:pattern, {match -> {
+    \   'text': match[1],
+    \   'lnum': match[2] + 0,
+    \   'col': match[3] + 0,
+    \}})
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 endfunction
 
 call ale#linter#Define('json', {
 \   'name': 'jq',
+<<<<<<< HEAD
 \   'executable': function('ale#fixers#jq#GetExecutable'),
 \   'output_stream': 'stderr',
 \   'command': function('ale_linters#json#jq#GetCommand'),
+=======
+\   'executable': {b -> ale#Var(b, 'json_jq_executable')},
+\   'output_stream': 'stderr',
+\   'command': '%e',
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 \   'callback': 'ale_linters#json#jq#Handle',
 \})
diff --git a/sources_non_forked/ale/ale_linters/json/jsonlint.vim b/sources_non_forked/ale/ale_linters/json/jsonlint.vim
index f677b488..812540af 100755
--- a/sources_non_forked/ale/ale_linters/json/jsonlint.vim
+++ b/sources_non_forked/ale/ale_linters/json/jsonlint.vim
@@ -4,7 +4,7 @@ call ale#Set('json_jsonlint_executable', 'jsonlint')
 call ale#Set('json_jsonlint_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale_linters#json#jsonlint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'json_jsonlint', [
+    return ale#path#FindExecutable(a:buffer, 'json_jsonlint', [
     \   'node_modules/.bin/jsonlint',
     \   'node_modules/jsonlint/lib/cli.js',
     \])
diff --git a/sources_non_forked/ale/ale_linters/json/spectral.vim b/sources_non_forked/ale/ale_linters/json/spectral.vim
index c7d56234..f47531cf 100755
--- a/sources_non_forked/ale/ale_linters/json/spectral.vim
+++ b/sources_non_forked/ale/ale_linters/json/spectral.vim
@@ -6,7 +6,11 @@ call ale#Set('json_spectral_use_global', get(g:, 'ale_use_global_executables', 0
 
 call ale#linter#Define('json', {
 \   'name': 'spectral',
+<<<<<<< HEAD
 \   'executable': {b -> ale#node#FindExecutable(b, 'json_spectral', [
+=======
+\   'executable': {b -> ale#path#FindExecutable(b, 'json_spectral', [
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 \       'node_modules/.bin/spectral',
 \   ])},
 \   'command': '%e lint --ignore-unknown-format -q -f text %t',
diff --git a/sources_non_forked/ale/ale_linters/kotlin/kotlinc.vim b/sources_non_forked/ale/ale_linters/kotlin/kotlinc.vim
index 66c075be..e8bc924d 100755
--- a/sources_non_forked/ale/ale_linters/kotlin/kotlinc.vim
+++ b/sources_non_forked/ale/ale_linters/kotlin/kotlinc.vim
@@ -15,20 +15,15 @@ function! ale_linters#kotlin#kotlinc#RunWithImportPaths(buffer) abort
     let l:command = ''
 
     " exec maven/gradle only if classpath is not set
-    if ale#Var(a:buffer, 'kotlin_kotlinc_classpath') isnot# ''
+    if !empty(ale#Var(a:buffer, 'kotlin_kotlinc_classpath'))
         return ale_linters#kotlin#kotlinc#GetCommand(a:buffer, [], {})
     endif
 
-    let l:pom_path = ale#path#FindNearestFile(a:buffer, 'pom.xml')
-
-    if !empty(l:pom_path) && executable('mvn')
-        let l:command = ale#path#CdString(fnamemodify(l:pom_path, ':h'))
-        \   . 'mvn dependency:build-classpath'
-    endif
+    let [l:cwd, l:command] = ale#maven#BuildClasspathCommand(a:buffer)
 
     " Try to use Gradle if Maven isn't available.
     if empty(l:command)
-        let l:command = ale#gradle#BuildClasspathCommand(a:buffer)
+        let [l:cwd, l:command] = ale#gradle#BuildClasspathCommand(a:buffer)
     endif
 
     if empty(l:command)
@@ -38,7 +33,8 @@ function! ale_linters#kotlin#kotlinc#RunWithImportPaths(buffer) abort
     return ale#command#Run(
     \   a:buffer,
     \   l:command,
-    \   function('ale_linters#kotlin#kotlinc#GetCommand')
+    \   function('ale_linters#kotlin#kotlinc#GetCommand'),
+    \   {'cwd': l:cwd},
     \)
 endfunction
 
diff --git a/sources_non_forked/ale/ale_linters/less/lessc.vim b/sources_non_forked/ale/ale_linters/less/lessc.vim
index 4ec8b00e..8e21f5b4 100755
--- a/sources_non_forked/ale/ale_linters/less/lessc.vim
+++ b/sources_non_forked/ale/ale_linters/less/lessc.vim
@@ -38,7 +38,7 @@ endfunction
 
 call ale#linter#Define('less', {
 \   'name': 'lessc',
-\   'executable': {b -> ale#node#FindExecutable(b, 'less_lessc', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'less_lessc', [
 \       'node_modules/.bin/lessc',
 \   ])},
 \   'command': function('ale_linters#less#lessc#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/less/stylelint.vim b/sources_non_forked/ale/ale_linters/less/stylelint.vim
index efb036c2..83f784c4 100755
--- a/sources_non_forked/ale/ale_linters/less/stylelint.vim
+++ b/sources_non_forked/ale/ale_linters/less/stylelint.vim
@@ -12,7 +12,7 @@ endfunction
 
 call ale#linter#Define('less', {
 \   'name': 'stylelint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'less_stylelint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'less_stylelint', [
 \       'node_modules/.bin/stylelint',
 \   ])},
 \   'command': function('ale_linters#less#stylelint#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/markdown/remark_lint.vim b/sources_non_forked/ale/ale_linters/markdown/remark_lint.vim
index ed87d1ad..6085e7ef 100755
--- a/sources_non_forked/ale/ale_linters/markdown/remark_lint.vim
+++ b/sources_non_forked/ale/ale_linters/markdown/remark_lint.vim
@@ -39,7 +39,7 @@ endfunction
 call ale#linter#Define('markdown', {
 \   'name': 'remark_lint',
 \   'aliases': ['remark-lint'],
-\   'executable': {b -> ale#node#FindExecutable(b, 'markdown_remark_lint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'markdown_remark_lint', [
 \       'node_modules/.bin/remark',
 \   ])},
 \   'command': function('ale_linters#markdown#remark_lint#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/mercury/mmc.vim b/sources_non_forked/ale/ale_linters/mercury/mmc.vim
index 8a9ccc0e..85969e10 100755
--- a/sources_non_forked/ale/ale_linters/mercury/mmc.vim
+++ b/sources_non_forked/ale/ale_linters/mercury/mmc.vim
@@ -5,12 +5,9 @@ call ale#Set('mercury_mmc_executable', 'mmc')
 call ale#Set('mercury_mmc_options', '--make --output-compile-error-lines 100')
 
 function! ale_linters#mercury#mmc#GetCommand(buffer) abort
-    let l:module_name = expand('#' . a:buffer . ':t:r')
-
-    return ale#path#BufferCdString(a:buffer)
-    \ . '%e --errorcheck-only '
+    return '%e --errorcheck-only '
     \ . ale#Var(a:buffer, 'mercury_mmc_options')
-    \ . ' ' . l:module_name
+    \ . ' %s:t:r'
 endfunction
 
 function! ale_linters#mercury#mmc#Handle(buffer, lines) abort
@@ -34,6 +31,7 @@ call ale#linter#Define('mercury', {
 \   'name': 'mmc',
 \   'output_stream': 'stderr',
 \   'executable': {b -> ale#Var(b, 'mercury_mmc_executable')},
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#mercury#mmc#GetCommand'),
 \   'callback': 'ale_linters#mercury#mmc#Handle',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/ale_linters/ocamlinterface/merlin.vim b/sources_non_forked/ale/ale_linters/ocamlinterface/merlin.vim
new file mode 100644
index 00000000..799490f7
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/ocamlinterface/merlin.vim
@@ -0,0 +1,17 @@
+" Author: Andrey Popp -- @andreypopp
+" Description: Report errors in OCaml code with Merlin
+
+if !exists('g:merlin')
+    finish
+endif
+
+function! ale_linters#ocamlinterface#merlin#Handle(buffer, lines) abort
+    return merlin#ErrorLocList()
+endfunction
+
+call ale#linter#Define('ocamlinterface', {
+\   'name': 'merlin',
+\   'executable': 'ocamlmerlin',
+\   'command': 'true',
+\   'callback': 'ale_linters#ocamlinterface#merlin#Handle',
+\})
diff --git a/sources_non_forked/ale/ale_linters/ocamlinterface/ocamllsp.vim b/sources_non_forked/ale/ale_linters/ocamlinterface/ocamllsp.vim
new file mode 100644
index 00000000..cd4bea80
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/ocamlinterface/ocamllsp.vim
@@ -0,0 +1,13 @@
+" Author: Risto Stevcev <me@risto.codes>
+" Description: The official language server for OCaml
+
+call ale#Set('ocaml_ocamllsp_use_opam', 1)
+
+call ale#linter#Define('ocamlinterface', {
+\   'name': 'ocamllsp',
+\   'lsp': 'stdio',
+\   'executable': function('ale#handlers#ocamllsp#GetExecutable'),
+\   'command': function('ale#handlers#ocamllsp#GetCommand'),
+\   'language': function('ale#handlers#ocamllsp#GetLanguage'),
+\   'project_root': function('ale#handlers#ocamllsp#GetProjectRoot'),
+\})
diff --git a/sources_non_forked/ale/ale_linters/php/intelephense.vim b/sources_non_forked/ale/ale_linters/php/intelephense.vim
index aca619e3..0fdcc93e 100755
--- a/sources_non_forked/ale/ale_linters/php/intelephense.vim
+++ b/sources_non_forked/ale/ale_linters/php/intelephense.vim
@@ -26,7 +26,7 @@ call ale#linter#Define('php', {
 \   'name': 'intelephense',
 \   'lsp': 'stdio',
 \   'initialization_options': function('ale_linters#php#intelephense#GetInitializationOptions'),
-\   'executable': {b -> ale#node#FindExecutable(b, 'php_intelephense', [])},
+\   'executable': {b -> ale#path#FindExecutable(b, 'php_intelephense', [])},
 \   'command': '%e --stdio',
 \   'project_root': function('ale_linters#php#intelephense#GetProjectRoot'),
 \})
diff --git a/sources_non_forked/ale/ale_linters/php/langserver.vim b/sources_non_forked/ale/ale_linters/php/langserver.vim
index fdd1bf2b..c3d89a00 100755
--- a/sources_non_forked/ale/ale_linters/php/langserver.vim
+++ b/sources_non_forked/ale/ale_linters/php/langserver.vim
@@ -19,7 +19,7 @@ endfunction
 call ale#linter#Define('php', {
 \   'name': 'langserver',
 \   'lsp': 'stdio',
-\   'executable': {b -> ale#node#FindExecutable(b, 'php_langserver', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'php_langserver', [
 \       'vendor/bin/php-language-server.php',
 \   ])},
 \   'command': 'php %e',
diff --git a/sources_non_forked/ale/ale_linters/php/phpcs.vim b/sources_non_forked/ale/ale_linters/php/phpcs.vim
index c5a3faa9..ce47a13b 100755
--- a/sources_non_forked/ale/ale_linters/php/phpcs.vim
+++ b/sources_non_forked/ale/ale_linters/php/phpcs.vim
@@ -13,8 +13,7 @@ function! ale_linters#php#phpcs#GetCommand(buffer) abort
     \   ? '--standard=' . ale#Escape(l:standard)
     \   : ''
 
-    return ale#path#BufferCdString(a:buffer)
-    \   . '%e -s --report=emacs --stdin-path=%s'
+    return '%e -s --report=emacs --stdin-path=%s'
     \   . ale#Pad(l:standard_option)
     \   . ale#Pad(ale#Var(a:buffer, 'php_phpcs_options'))
 endfunction
@@ -45,10 +44,11 @@ endfunction
 
 call ale#linter#Define('php', {
 \   'name': 'phpcs',
-\   'executable': {b -> ale#node#FindExecutable(b, 'php_phpcs', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'php_phpcs', [
 \       'vendor/bin/phpcs',
 \       'phpcs'
 \   ])},
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#php#phpcs#GetCommand'),
 \   'callback': 'ale_linters#php#phpcs#Handle',
 \})
diff --git a/sources_non_forked/ale/ale_linters/php/psalm.vim b/sources_non_forked/ale/ale_linters/php/psalm.vim
index 286c8a96..dbbe9453 100755
--- a/sources_non_forked/ale/ale_linters/php/psalm.vim
+++ b/sources_non_forked/ale/ale_linters/php/psalm.vim
@@ -18,7 +18,7 @@ endfunction
 call ale#linter#Define('php', {
 \   'name': 'psalm',
 \   'lsp': 'stdio',
-\   'executable': {b -> ale#node#FindExecutable(b, 'php_psalm', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'php_psalm', [
 \       'vendor/bin/psalm',
 \   ])},
 \   'command': function('ale_linters#php#psalm#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/php/tlint.vim b/sources_non_forked/ale/ale_linters/php/tlint.vim
index 6bba8def..80bdd1f6 100755
--- a/sources_non_forked/ale/ale_linters/php/tlint.vim
+++ b/sources_non_forked/ale/ale_linters/php/tlint.vim
@@ -20,7 +20,7 @@ function! ale_linters#php#tlint#GetProjectRoot(buffer) abort
 endfunction
 
 function! ale_linters#php#tlint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'php_tlint', [
+    return ale#path#FindExecutable(a:buffer, 'php_tlint', [
     \   'vendor/bin/tlint',
     \   'tlint',
     \])
diff --git a/sources_non_forked/ale/ale_linters/proto/protolint.vim b/sources_non_forked/ale/ale_linters/proto/protolint.vim
new file mode 100644
index 00000000..2754c7b6
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/proto/protolint.vim
@@ -0,0 +1,24 @@
+" Author: Yohei Yoshimuta <yoheimuta@gmail.com>
+" Description: run the protolint for Protocol Buffer files
+
+call ale#Set('proto_protolint_executable', 'protolint')
+call ale#Set('proto_protolint_config', '')
+
+function! ale_linters#proto#protolint#GetCommand(buffer) abort
+    let l:config = ale#Var(a:buffer, 'proto_protolint_config')
+
+    return '%e lint'
+    \ . (!empty(l:config) ? ' -config_path=' . ale#Escape(l:config) : '')
+    \ . ' -reporter=unix'
+    \ . ' %s'
+endfunction
+
+call ale#linter#Define('proto', {
+\   'name': 'protolint',
+\   'lint_file': 1,
+\   'output_stream': 'stderr',
+\   'executable': {b -> ale#Var(b, 'proto_protolint_executable')},
+\   'command': function('ale_linters#proto#protolint#GetCommand'),
+\   'callback': 'ale#handlers#unix#HandleAsError',
+\})
+
diff --git a/sources_non_forked/ale/ale_linters/pug/puglint.vim b/sources_non_forked/ale/ale_linters/pug/puglint.vim
index c819cc45..b552cc06 100755
--- a/sources_non_forked/ale/ale_linters/pug/puglint.vim
+++ b/sources_non_forked/ale/ale_linters/pug/puglint.vim
@@ -47,7 +47,7 @@ endfunction
 
 call ale#linter#Define('pug', {
 \   'name': 'puglint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'pug_puglint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'pug_puglint', [
 \       'node_modules/.bin/pug-lint',
 \   ])},
 \   'output_stream': 'stderr',
diff --git a/sources_non_forked/ale/ale_linters/purescript/ls.vim b/sources_non_forked/ale/ale_linters/purescript/ls.vim
index 1c5f937f..a20fae47 100755
--- a/sources_non_forked/ale/ale_linters/purescript/ls.vim
+++ b/sources_non_forked/ale/ale_linters/purescript/ls.vim
@@ -6,7 +6,7 @@ call ale#Set('purescript_ls_use_global', get(g:, 'ale_use_global_executables', 0
 call ale#Set('purescript_ls_config', {})
 
 function! ale_linters#purescript#ls#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'purescript_ls', [
+    return ale#path#FindExecutable(a:buffer, 'purescript_ls', [
     \   'node_modules/.bin/purescript-language-server',
     \])
 endfunction
diff --git a/sources_non_forked/ale/ale_linters/python/flake8.vim b/sources_non_forked/ale/ale_linters/python/flake8.vim
index fc4ab692..1d49d03f 100755
--- a/sources_non_forked/ale/ale_linters/python/flake8.vim
+++ b/sources_non_forked/ale/ale_linters/python/flake8.vim
@@ -38,30 +38,28 @@ function! ale_linters#python#flake8#RunWithVersionCheck(buffer) abort
     \)
 endfunction
 
-function! ale_linters#python#flake8#GetCdString(buffer) abort
+function! ale_linters#python#flake8#GetCwd(buffer) abort
     let l:change_directory = ale#Var(a:buffer, 'python_flake8_change_directory')
-    let l:cd_string = ''
+    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:cd_string = ale#path#CdString(l:project_root)
+            let l:cwd = l:project_root
         endif
     endif
 
-    if (l:change_directory is# 'project' && empty(l:cd_string))
+    if (l:change_directory is# 'project' && empty(l:cwd))
     \|| l:change_directory is# 1
     \|| l:change_directory is# 'file'
-        let l:cd_string = ale#path#BufferCdString(a:buffer)
+        let l:cwd = '%s:h'
     endif
 
-    return l:cd_string
+    return l:cwd
 endfunction
 
 function! ale_linters#python#flake8#GetCommand(buffer, version) abort
-    let l:cd_string = ale_linters#python#flake8#GetCdString(a:buffer)
-
     let l:executable = ale_linters#python#flake8#GetExecutable(a:buffer)
 
     let l:exec_args = l:executable =~? 'pipenv$'
@@ -76,8 +74,7 @@ function! ale_linters#python#flake8#GetCommand(buffer, version) abort
 
     let l:options = ale#Var(a:buffer, 'python_flake8_options')
 
-    return l:cd_string
-    \   . ale#Escape(l:executable) . l:exec_args
+    return ale#Escape(l:executable) . l:exec_args
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . ' --format=default'
     \   . l:display_name_args . ' -'
@@ -161,6 +158,7 @@ endfunction
 call ale#linter#Define('python', {
 \   'name': 'flake8',
 \   'executable': function('ale_linters#python#flake8#GetExecutable'),
+\   'cwd': function('ale_linters#python#flake8#GetCwd'),
 \   'command': function('ale_linters#python#flake8#RunWithVersionCheck'),
 \   'callback': 'ale_linters#python#flake8#Handle',
 \})
diff --git a/sources_non_forked/ale/ale_linters/python/mypy.vim b/sources_non_forked/ale/ale_linters/python/mypy.vim
index 1e35d929..75918beb 100755
--- a/sources_non_forked/ale/ale_linters/python/mypy.vim
+++ b/sources_non_forked/ale/ale_linters/python/mypy.vim
@@ -18,7 +18,7 @@ function! ale_linters#python#mypy#GetExecutable(buffer) abort
 endfunction
 
 " The directory to change to before running mypy
-function! s:GetDir(buffer) abort
+function! ale_linters#python#mypy#GetCwd(buffer) abort
     " If we find a directory with "mypy.ini" in it use that,
     " else try and find the "python project" root, or failing
     " that, run from the same folder as the current file
@@ -36,13 +36,12 @@ function! s:GetDir(buffer) abort
 endfunction
 
 function! ale_linters#python#mypy#GetCommand(buffer) abort
-    let l:dir = s:GetDir(a:buffer)
     let l:executable = ale_linters#python#mypy#GetExecutable(a:buffer)
-
     let l:exec_args = l:executable =~? 'pipenv$'
     \   ? ' run mypy'
     \   : ''
 
+<<<<<<< HEAD
     let l:options = ale#Var(a:buffer, 'python_mypy_options')
 
     " We have to always switch to an explicit directory for a command so
@@ -50,12 +49,16 @@ function! ale_linters#python#mypy#GetCommand(buffer) abort
     return ale#path#CdString(l:dir)
     \   . ale#Escape(l:executable) . l:exec_args
     \   . (len(l:options) ? (' ' . l:options) : '')
+=======
+    return '%e' . l:exec_args
+    \   . ale#Pad(ale#Var(a:buffer, 'python_mypy_options'))
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     \   . ' --show-column-numbers'
     \   . ' --shadow-file %s %t %s'
 endfunction
 
 function! ale_linters#python#mypy#Handle(buffer, lines) abort
-    let l:dir = s:GetDir(a:buffer)
+    let l:dir = ale_linters#python#mypy#GetCwd(a:buffer)
     " Look for lines like the following:
     "
     " file.py:4: error: No library stub file for module 'django.db'
@@ -97,6 +100,7 @@ endfunction
 call ale#linter#Define('python', {
 \   'name': 'mypy',
 \   'executable': function('ale_linters#python#mypy#GetExecutable'),
+\   'cwd': function('ale_linters#python#mypy#GetCwd'),
 \   'command': function('ale_linters#python#mypy#GetCommand'),
 \   'callback': 'ale_linters#python#mypy#Handle',
 \   'output_stream': 'both'
diff --git a/sources_non_forked/ale/ale_linters/python/pydocstyle.vim b/sources_non_forked/ale/ale_linters/python/pydocstyle.vim
index 69ae3807..abf95fa1 100755
--- a/sources_non_forked/ale/ale_linters/python/pydocstyle.vim
+++ b/sources_non_forked/ale/ale_linters/python/pydocstyle.vim
@@ -21,8 +21,7 @@ function! ale_linters#python#pydocstyle#GetCommand(buffer) abort
     \   ? ' run pydocstyle'
     \   : ''
 
-    return ale#path#BufferCdString(a:buffer)
-    \   . ale#Escape(l:executable) . l:exec_args
+    return ale#Escape(l:executable) . l:exec_args
     \   . ale#Pad(ale#Var(a:buffer, 'python_pydocstyle_options'))
     \   . ' %s:t'
 endfunction
@@ -66,6 +65,7 @@ endfunction
 call ale#linter#Define('python', {
 \   'name': 'pydocstyle',
 \   'executable': function('ale_linters#python#pydocstyle#GetExecutable'),
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#python#pydocstyle#GetCommand'),
 \   'callback': 'ale_linters#python#pydocstyle#Handle',
 \})
diff --git a/sources_non_forked/ale/ale_linters/python/pylama.vim b/sources_non_forked/ale/ale_linters/python/pylama.vim
index 38dd2836..bad69667 100755
--- a/sources_non_forked/ale/ale_linters/python/pylama.vim
+++ b/sources_non_forked/ale/ale_linters/python/pylama.vim
@@ -16,19 +16,20 @@ function! ale_linters#python#pylama#GetExecutable(buffer) abort
     return ale#python#FindExecutable(a:buffer, 'python_pylama', ['pylama'])
 endfunction
 
-function! ale_linters#python#pylama#GetCommand(buffer) abort
-    let l:cd_string = ''
-
+function! ale_linters#python#pylama#GetCwd(buffer) abort
     if ale#Var(a:buffer, 'python_pylama_change_directory')
         " Pylama loads its configuration from the current directory only, and
         " applies file masks using paths relative to the current directory.
         " Run from project root, if found, otherwise buffer dir.
         let l:project_root = ale#python#FindProjectRoot(a:buffer)
-        let l:cd_string = l:project_root isnot# ''
-        \   ? ale#path#CdString(l:project_root)
-        \   : ale#path#BufferCdString(a:buffer)
+
+        return !empty(l:project_root) ? l:project_root : '%s:h'
     endif
 
+    return ''
+endfunction
+
+function! ale_linters#python#pylama#GetCommand(buffer) abort
     let l:executable = ale_linters#python#pylama#GetExecutable(a:buffer)
     let l:exec_args = l:executable =~? 'pipenv$'
     \   ? ' run pylama'
@@ -37,8 +38,7 @@ function! ale_linters#python#pylama#GetCommand(buffer) abort
     " Note: Using %t to lint changes would be preferable, but many pylama
     " checks use surrounding paths (e.g. C0103 module name, E0402 relative
     " import beyond top, etc.).  Neither is ideal.
-    return l:cd_string
-    \   . ale#Escape(l:executable) . l:exec_args
+    return ale#Escape(l:executable) . l:exec_args
     \   . ale#Pad(ale#Var(a:buffer, 'python_pylama_options'))
     \   . ' %s'
 endfunction
@@ -86,6 +86,7 @@ endfunction
 call ale#linter#Define('python', {
 \   'name': 'pylama',
 \   'executable': function('ale_linters#python#pylama#GetExecutable'),
+\   'cwd': function('ale_linters#python#pylama#GetCwd'),
 \   'command': function('ale_linters#python#pylama#GetCommand'),
 \   'callback': 'ale_linters#python#pylama#Handle',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/ale_linters/python/pylint.vim b/sources_non_forked/ale/ale_linters/python/pylint.vim
index 44eea246..f086a865 100755
--- a/sources_non_forked/ale/ale_linters/python/pylint.vim
+++ b/sources_non_forked/ale/ale_linters/python/pylint.vim
@@ -17,27 +17,26 @@ function! ale_linters#python#pylint#GetExecutable(buffer) abort
     return ale#python#FindExecutable(a:buffer, 'python_pylint', ['pylint'])
 endfunction
 
-function! ale_linters#python#pylint#GetCommand(buffer, version) abort
-    let l:cd_string = ''
-
+function! ale_linters#python#pylint#GetCwd(buffer) abort
     if ale#Var(a:buffer, 'python_pylint_change_directory')
         " pylint only checks for pylintrc in the packages above its current
         " directory before falling back to user and global pylintrc.
         " Run from project root, if found, otherwise buffer dir.
         let l:project_root = ale#python#FindProjectRoot(a:buffer)
-        let l:cd_string = l:project_root isnot# ''
-        \   ? ale#path#CdString(l:project_root)
-        \   : ale#path#BufferCdString(a:buffer)
+
+        return !empty(l:project_root) ? l:project_root : '%s:h'
     endif
 
-    let l:executable = ale_linters#python#pylint#GetExecutable(a:buffer)
+    return ''
+endfunction
 
+function! ale_linters#python#pylint#GetCommand(buffer, version) abort
+    let l:executable = ale_linters#python#pylint#GetExecutable(a:buffer)
     let l:exec_args = l:executable =~? 'pipenv$'
     \   ? ' run pylint'
     \   : ''
 
-    return l:cd_string
-    \   . ale#Escape(l:executable) . l:exec_args
+    return ale#Escape(l:executable) . l:exec_args
     \   . ale#Pad(ale#Var(a:buffer, 'python_pylint_options'))
     \   . ' --output-format text --msg-template="{path}:{line}:{column}: {msg_id} ({symbol}) {msg}" --reports n'
     \   .  (ale#semver#GTE(a:version, [2, 4, 0]) ? ' --from-stdin' : '')
@@ -104,6 +103,7 @@ call ale#linter#Define('python', {
 \       '%e --version',
 \       {buffer, version -> !ale#semver#GTE(version, [2, 4, 0])},
 \   )},
+\   'cwd': function('ale_linters#python#pylint#GetCwd'),
 \   'command': {buffer -> ale#semver#RunWithVersionCheck(
 \       buffer,
 \       ale#Var(buffer, 'python_pylint_executable'),
diff --git a/sources_non_forked/ale/ale_linters/python/pyls.vim b/sources_non_forked/ale/ale_linters/python/pyls.vim
index c7f91430..10304b2c 100755
--- a/sources_non_forked/ale/ale_linters/python/pyls.vim
+++ b/sources_non_forked/ale/ale_linters/python/pyls.vim
@@ -2,6 +2,7 @@
 " Description: A language server for Python
 
 call ale#Set('python_pyls_executable', 'pyls')
+call ale#Set('python_pyls_options', '')
 call ale#Set('python_pyls_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('python_pyls_auto_pipenv', 0)
 call ale#Set('python_pyls_config', {})
@@ -22,7 +23,7 @@ function! ale_linters#python#pyls#GetCommand(buffer) abort
     \   ? ' run pyls'
     \   : ''
 
-    return ale#Escape(l:executable) . l:exec_args
+    return ale#Escape(l:executable) . l:exec_args . ale#Pad(ale#Var(a:buffer, 'python_pyls_options'))
 endfunction
 
 call ale#linter#Define('python', {
diff --git a/sources_non_forked/ale/ale_linters/python/vulture.vim b/sources_non_forked/ale/ale_linters/python/vulture.vim
index d328d262..84ffd49a 100755
--- a/sources_non_forked/ale/ale_linters/python/vulture.vim
+++ b/sources_non_forked/ale/ale_linters/python/vulture.vim
@@ -6,7 +6,6 @@ call ale#Set('python_vulture_options', '')
 call ale#Set('python_vulture_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('python_vulture_change_directory', 1)
 
-
 " The directory to change to before running vulture
 function! s:GetDir(buffer) abort
     let l:project_root = ale#python#FindProjectRoot(a:buffer)
@@ -16,29 +15,28 @@ function! s:GetDir(buffer) abort
     \   : expand('#' . a:buffer . ':p:h')
 endfunction
 
-
 function! ale_linters#python#vulture#GetExecutable(buffer) abort
     return ale#python#FindExecutable(a:buffer, 'python_vulture', ['vulture'])
 endfunction
 
+function! ale_linters#python#vulture#GetCwd(buffer) abort
+    if !ale#Var(a:buffer, 'python_vulture_change_directory')
+        return ''
+    endif
+
+    return s:GetDir(a:buffer)
+endfunction
 
 function! ale_linters#python#vulture#GetCommand(buffer) abort
-    let l:change_dir = ale#Var(a:buffer, 'python_vulture_change_directory')
-    \   ? ale#path#CdString(s:GetDir(a:buffer))
-    \   : ''
-
     let l:executable = ale_linters#python#vulture#GetExecutable(a:buffer)
-
     let l:exec_args = l:executable =~? 'pipenv$'
     \   ? ' run vulture'
     \   : ''
-
     let l:lint_dest = ale#Var(a:buffer, 'python_vulture_change_directory')
     \   ? ' .'
     \   : ' %s'
 
-    return l:change_dir
-    \   . ale#Escape(l:executable) . l:exec_args
+    return ale#Escape(l:executable) . l:exec_args
     \   . ' '
     \   . ale#Var(a:buffer, 'python_vulture_options')
     \   . l:lint_dest
@@ -74,6 +72,7 @@ endfunction
 call ale#linter#Define('python', {
 \   'name': 'vulture',
 \   'executable': function('ale_linters#python#vulture#GetExecutable'),
+\   'cwd': function('ale_linters#python#vulture#GetCwd'),
 \   'command': function('ale_linters#python#vulture#GetCommand'),
 \   'callback': 'ale_linters#python#vulture#Handle',
 \   'lint_file': 1,
diff --git a/sources_non_forked/ale/ale_linters/r/lintr.vim b/sources_non_forked/ale/ale_linters/r/lintr.vim
index 3164c06f..339ad2b0 100755
--- a/sources_non_forked/ale/ale_linters/r/lintr.vim
+++ b/sources_non_forked/ale/ale_linters/r/lintr.vim
@@ -1,5 +1,6 @@
 " Author: Michel Lang <michellang@gmail.com>, w0rp <devw0rp@gmail.com>,
-"         Fenner Macrae <fmacrae.dev@gmail.com>
+"         Fenner Macrae <fmacrae.dev@gmail.com>,
+"         ourigen <https://github.com/ourigen>
 " Description: This file adds support for checking R code with lintr.
 
 let g:ale_r_lintr_options = get(g:, 'ale_r_lintr_options', 'with_defaults()')
@@ -21,14 +22,13 @@ function! ale_linters#r#lintr#GetCommand(buffer) abort
     let l:cmd_string = 'suppressPackageStartupMessages(library(lintr));'
     \   . l:lint_cmd
 
-    return ale#path#BufferCdString(a:buffer)
-    \   . 'Rscript --vanilla -e '
-    \   . ale#Escape(l:cmd_string) . ' %t'
+    return 'Rscript --no-save --no-restore --no-site-file --no-init-file -e ' . ale#Escape(l:cmd_string) . ' %t'
 endfunction
 
 call ale#linter#Define('r', {
 \   'name': 'lintr',
 \   'executable': 'Rscript',
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#r#lintr#GetCommand'),
 \   'callback': 'ale#handlers#gcc#HandleGCCFormat',
 \   'output_stream': 'both',
diff --git a/sources_non_forked/ale/ale_linters/rst/rstcheck.vim b/sources_non_forked/ale/ale_linters/rst/rstcheck.vim
index 39e11d6e..e0cf0798 100755
--- a/sources_non_forked/ale/ale_linters/rst/rstcheck.vim
+++ b/sources_non_forked/ale/ale_linters/rst/rstcheck.vim
@@ -1,6 +1,5 @@
 " Author: John Nduli https://github.com/jnduli
 " Description: Rstcheck for reStructuredText files
-"
 
 function! ale_linters#rst#rstcheck#Handle(buffer, lines) abort
     " matches: 'bad_rst.rst:1: (SEVERE/4) Title overline & underline
@@ -22,17 +21,11 @@ function! ale_linters#rst#rstcheck#Handle(buffer, lines) abort
     return l:output
 endfunction
 
-function! ale_linters#rst#rstcheck#GetCommand(buffer) abort
-    return ale#path#BufferCdString(a:buffer)
-    \   . 'rstcheck'
-    \   . ' %t'
-endfunction
-
-
 call ale#linter#Define('rst', {
 \   'name': 'rstcheck',
 \   'executable': 'rstcheck',
-\   'command': function('ale_linters#rst#rstcheck#GetCommand'),
+\   'cwd': '%s:h',
+\   'command': 'rstcheck %t',
 \   'callback': 'ale_linters#rst#rstcheck#Handle',
 \   'output_stream': 'both',
 \})
diff --git a/sources_non_forked/ale/ale_linters/rust/cargo.vim b/sources_non_forked/ale/ale_linters/rust/cargo.vim
index 3407abed..37fd10a8 100755
--- a/sources_non_forked/ale/ale_linters/rust/cargo.vim
+++ b/sources_non_forked/ale/ale_linters/rust/cargo.vim
@@ -23,6 +23,19 @@ function! ale_linters#rust#cargo#GetCargoExecutable(bufnr) abort
     endif
 endfunction
 
+function! ale_linters#rust#cargo#GetCwd(buffer) abort
+    if ale#Var(a:buffer, 'rust_cargo_avoid_whole_workspace')
+        let l:nearest_cargo = ale#path#FindNearestFile(a:buffer, 'Cargo.toml')
+        let l:nearest_cargo_dir = fnamemodify(l:nearest_cargo, ':h')
+
+        if l:nearest_cargo_dir isnot# '.'
+            return l:nearest_cargo_dir
+        endif
+    endif
+
+    return ''
+endfunction
+
 function! ale_linters#rust#cargo#GetCommand(buffer, version) abort
     let l:use_check = ale#Var(a:buffer, 'rust_cargo_use_check')
     \   && ale#semver#GTE(a:version, [0, 17, 0])
@@ -42,18 +55,6 @@ function! ale_linters#rust#cargo#GetCommand(buffer, version) abort
         let l:include_features = ' --features ' . ale#Escape(l:include_features)
     endif
 
-    let l:avoid_whole_workspace = ale#Var(a:buffer, 'rust_cargo_avoid_whole_workspace')
-    let l:nearest_cargo_prefix = ''
-
-    if l:avoid_whole_workspace
-        let l:nearest_cargo = ale#path#FindNearestFile(a:buffer, 'Cargo.toml')
-        let l:nearest_cargo_dir = fnamemodify(l:nearest_cargo, ':h')
-
-        if l:nearest_cargo_dir isnot# '.'
-            let l:nearest_cargo_prefix = 'cd '. ale#Escape(l:nearest_cargo_dir) .' && '
-        endif
-    endif
-
     let l:default_feature_behavior = ale#Var(a:buffer, 'rust_cargo_default_feature_behavior')
 
     if l:default_feature_behavior is# 'all'
@@ -81,7 +82,7 @@ function! ale_linters#rust#cargo#GetCommand(buffer, version) abort
         endif
     endif
 
-    return l:nearest_cargo_prefix . 'cargo '
+    return 'cargo '
     \   . l:subcommand
     \   . (l:use_all_targets ? ' --all-targets' : '')
     \   . (l:use_examples ? ' --examples' : '')
@@ -96,6 +97,7 @@ endfunction
 call ale#linter#Define('rust', {
 \   'name': 'cargo',
 \   'executable': function('ale_linters#rust#cargo#GetCargoExecutable'),
+\   'cwd': function('ale_linters#rust#cargo#GetCwd'),
 \   'command': {buffer -> ale#semver#RunWithVersionCheck(
 \       buffer,
 \       ale_linters#rust#cargo#GetCargoExecutable(buffer),
diff --git a/sources_non_forked/ale/ale_linters/sass/sasslint.vim b/sources_non_forked/ale/ale_linters/sass/sasslint.vim
index 17cd3667..ff396e68 100755
--- a/sources_non_forked/ale/ale_linters/sass/sasslint.vim
+++ b/sources_non_forked/ale/ale_linters/sass/sasslint.vim
@@ -5,7 +5,7 @@ call ale#Set('sass_sasslint_options', '')
 call ale#Set('sass_sasslint_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale_linters#sass#sasslint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'sass_sasslint', [
+    return ale#path#FindExecutable(a:buffer, 'sass_sasslint', [
     \   'node_modules/sass-lint/bin/sass-lint.js',
     \   'node_modules/.bin/sass-lint',
     \])
diff --git a/sources_non_forked/ale/ale_linters/sass/stylelint.vim b/sources_non_forked/ale/ale_linters/sass/stylelint.vim
index 7b14c6b4..22abef9b 100755
--- a/sources_non_forked/ale/ale_linters/sass/stylelint.vim
+++ b/sources_non_forked/ale/ale_linters/sass/stylelint.vim
@@ -5,7 +5,7 @@ call ale#Set('sass_stylelint_use_global', get(g:, 'ale_use_global_executables',
 
 call ale#linter#Define('sass', {
 \   'name': 'stylelint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'sass_stylelint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'sass_stylelint', [
 \       'node_modules/.bin/stylelint',
 \   ])},
 \   'command': '%e --stdin-filename %s',
diff --git a/sources_non_forked/ale/ale_linters/scss/sasslint.vim b/sources_non_forked/ale/ale_linters/scss/sasslint.vim
index cf13546e..99027051 100755
--- a/sources_non_forked/ale/ale_linters/scss/sasslint.vim
+++ b/sources_non_forked/ale/ale_linters/scss/sasslint.vim
@@ -5,7 +5,7 @@ call ale#Set('scss_sasslint_options', '')
 call ale#Set('scss_sasslint_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale_linters#scss#sasslint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'scss_sasslint', [
+    return ale#path#FindExecutable(a:buffer, 'scss_sasslint', [
     \   'node_modules/sass-lint/bin/sass-lint.js',
     \   'node_modules/.bin/sass-lint',
     \])
diff --git a/sources_non_forked/ale/ale_linters/scss/stylelint.vim b/sources_non_forked/ale/ale_linters/scss/stylelint.vim
index b5b21536..fea4ea8f 100755
--- a/sources_non_forked/ale/ale_linters/scss/stylelint.vim
+++ b/sources_non_forked/ale/ale_linters/scss/stylelint.vim
@@ -11,7 +11,7 @@ endfunction
 
 call ale#linter#Define('scss', {
 \   'name': 'stylelint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'scss_stylelint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'scss_stylelint', [
 \       'node_modules/.bin/stylelint',
 \   ])},
 \   'command': function('ale_linters#scss#stylelint#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/sh/language_server.vim b/sources_non_forked/ale/ale_linters/sh/language_server.vim
index 5a3b0e9a..c6781584 100755
--- a/sources_non_forked/ale/ale_linters/sh/language_server.vim
+++ b/sources_non_forked/ale/ale_linters/sh/language_server.vim
@@ -6,7 +6,7 @@ call ale#Set('sh_language_server_executable', 'bash-language-server')
 call ale#Set('sh_language_server_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale_linters#sh#language_server#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'sh_language_server', [
+    return ale#path#FindExecutable(a:buffer, 'sh_language_server', [
     \   'node_modules/.bin/bash-language-server',
     \])
 endfunction
diff --git a/sources_non_forked/ale/ale_linters/solidity/solhint.vim b/sources_non_forked/ale/ale_linters/solidity/solhint.vim
index 8ea33e07..505bd5bb 100755
--- a/sources_non_forked/ale/ale_linters/solidity/solhint.vim
+++ b/sources_non_forked/ale/ale_linters/solidity/solhint.vim
@@ -1,29 +1,12 @@
-" Author: Franco Victorio - https://github.com/fvictorio
+" Authors: Franco Victorio - https://github.com/fvictorio, Henrique Barcelos
+" https://github.com/hbarcelos
 " Description: Report errors in Solidity code with solhint
 
-function! ale_linters#solidity#solhint#Handle(buffer, lines) abort
-    " Matches patterns like the following:
-    " /path/to/file/file.sol: line 1, col 10, Error - 'addOne' is defined but never used. (no-unused-vars)
-    let l:pattern = '\v^[^:]+: line (\d+), col (\d+), (Error|Warning) - (.*) \((.*)\)$'
-    let l:output = []
-
-    for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        let l:isError = l:match[3] is? 'error'
-        call add(l:output, {
-        \   'lnum': l:match[1] + 0,
-        \   'col': l:match[2] + 0,
-        \   'text': l:match[4],
-        \   'code': l:match[5],
-        \   'type': l:isError ? 'E' : 'W',
-        \})
-    endfor
-
-    return l:output
-endfunction
-
 call ale#linter#Define('solidity', {
 \   'name': 'solhint',
-\   'executable': 'solhint',
-\   'command': 'solhint --formatter compact %t',
-\   'callback': 'ale_linters#solidity#solhint#Handle',
+\   'output_stream': 'both',
+\   'executable': function('ale#handlers#solhint#GetExecutable'),
+\   'cwd': function('ale#handlers#solhint#GetCwd'),
+\   'command': function('ale#handlers#solhint#GetCommand'),
+\   'callback': 'ale#handlers#solhint#Handle',
 \})
diff --git a/sources_non_forked/ale/ale_linters/stylus/stylelint.vim b/sources_non_forked/ale/ale_linters/stylus/stylelint.vim
index ce6f9426..b60e38ed 100755
--- a/sources_non_forked/ale/ale_linters/stylus/stylelint.vim
+++ b/sources_non_forked/ale/ale_linters/stylus/stylelint.vim
@@ -12,7 +12,7 @@ endfunction
 
 call ale#linter#Define('stylus', {
 \   'name': 'stylelint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'stylus_stylelint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'stylus_stylelint', [
 \       'node_modules/.bin/stylelint',
 \   ])},
 \   'command': function('ale_linters#stylus#stylelint#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/sugarss/stylelint.vim b/sources_non_forked/ale/ale_linters/sugarss/stylelint.vim
index 6c705e46..879ff0ca 100755
--- a/sources_non_forked/ale/ale_linters/sugarss/stylelint.vim
+++ b/sources_non_forked/ale/ale_linters/sugarss/stylelint.vim
@@ -13,7 +13,7 @@ endfunction
 
 call ale#linter#Define('sugarss', {
 \   'name': 'stylelint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'sugarss_stylelint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'sugarss_stylelint', [
 \       'node_modules/.bin/stylelint',
 \   ])},
 \   'command': function('ale_linters#sugarss#stylelint#GetCommand'),
diff --git a/sources_non_forked/ale/ale_linters/svelte/svelteserver.vim b/sources_non_forked/ale/ale_linters/svelte/svelteserver.vim
new file mode 100644
index 00000000..2200b582
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/svelte/svelteserver.vim
@@ -0,0 +1,21 @@
+" Author: Joakim Repomaa <joakim@repomaa.com>
+" Description: Svelte Language Server integration for ALE
+
+call ale#Set('svelte_svelteserver_executable', 'svelteserver')
+call ale#Set('svelte_svelteserver_use_global', get(g:, 'ale_use_global_executables', 0))
+
+function! ale_linters#svelte#svelteserver#GetProjectRoot(buffer) abort
+    let l:package_path = ale#path#FindNearestFile(a:buffer, 'package.json')
+
+    return !empty(l:package_path) ? fnamemodify(l:package_path, ':h') : ''
+endfunction
+
+call ale#linter#Define('svelte', {
+\   'name': 'svelteserver',
+\   'lsp': 'stdio',
+\   'executable': {b -> ale#path#FindExecutable(b, 'svelte_svelteserver', [
+\       'node_modules/.bin/svelteserver',
+\   ])},
+\   'command': '%e --stdio',
+\   'project_root': function('ale_linters#svelte#svelteserver#GetProjectRoot'),
+\})
diff --git a/sources_non_forked/ale/ale_linters/swift/appleswiftformat.vim b/sources_non_forked/ale/ale_linters/swift/appleswiftformat.vim
new file mode 100644
index 00000000..4c61764d
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/swift/appleswiftformat.vim
@@ -0,0 +1,43 @@
+" Authors: Klaas Pieter Annema <https://github.com/klaaspieter>, bosr <bosr@bosr.cc>
+" Description: Support for swift-format https://github.com/apple/swift-format
+
+function! ale_linters#swift#appleswiftformat#GetLinterCommand(buffer) abort
+    let l:command_args = ale#swift#GetAppleSwiftFormatCommand(a:buffer) . ' lint %t'
+    let l:config_args = ale#swift#GetAppleSwiftFormatConfigArgs(a:buffer)
+
+    if l:config_args isnot# ''
+        let l:command_args = l:command_args . ' ' . l:config_args
+    endif
+
+    return l:command_args
+endfunction
+
+function! ale_linters#swift#appleswiftformat#Handle(buffer, lines) abort
+    " Matches the typical output of swift-format, that is lines of the following pattern:
+    "
+    " Sources/main.swift:4:21: warning: [DoNotUseSemicolons] remove ';' and move the next statement to the new line
+    " Sources/main.swift:3:12: warning: [Spacing] remove 1 space
+    let l:pattern = '\v^.*:(\d+):(\d+): (\S+): \[(\S+)\] (.*)$'
+    let l:output = []
+
+    for l:match in ale#util#GetMatches(a:lines, l:pattern)
+        call add(l:output, {
+        \   'lnum': l:match[1] + 0,
+        \   'col': l:match[2] + 0,
+        \   'type': l:match[3] is# 'error' ? 'E' : 'W',
+        \   'code': l:match[4],
+        \   'text': l:match[5],
+        \})
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('swift', {
+\   'name': 'apple-swift-format',
+\   'executable': function('ale#swift#GetAppleSwiftFormatExecutable'),
+\   'command': function('ale_linters#swift#appleswiftformat#GetLinterCommand'),
+\   'output_stream': 'stderr',
+\   'language': 'swift',
+\   'callback': 'ale_linters#swift#appleswiftformat#Handle'
+\})
diff --git a/sources_non_forked/ale/ale_linters/swift/swiftlint.vim b/sources_non_forked/ale/ale_linters/swift/swiftlint.vim
index 237c45d3..d08c68f6 100755
--- a/sources_non_forked/ale/ale_linters/swift/swiftlint.vim
+++ b/sources_non_forked/ale/ale_linters/swift/swiftlint.vim
@@ -5,7 +5,7 @@ call ale#Set('swift_swiftlint_executable', 'swiftlint')
 call ale#Set('swift_swiftlint_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale_linters#swift#swiftlint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'swift_swiftlint', [
+    return ale#path#FindExecutable(a:buffer, 'swift_swiftlint', [
     \ 'Pods/SwiftLint/swiftlint',
     \ 'ios/Pods/SwiftLint/swiftlint',
     \ 'swiftlint',
diff --git a/sources_non_forked/ale/ale_linters/systemd/systemd_analyze.vim b/sources_non_forked/ale/ale_linters/systemd/systemd_analyze.vim
new file mode 100644
index 00000000..64eef8cf
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/systemd/systemd_analyze.vim
@@ -0,0 +1,18 @@
+function! ale_linters#systemd#systemd_analyze#Handle(buffer, lines) abort
+    return ale#util#MapMatches(a:lines, '\v(.+):([0-9]+): (.+)', {match -> {
+    \   'lnum': str2nr(match[2]),
+    \   'col': 1,
+    \   'type': 'W',
+    \   'text': match[3],
+    \}})
+endfunction
+
+call ale#linter#Define('systemd', {
+\   'name': 'systemd_analyze',
+\   'aliases': ['systemd-analyze'],
+\   'executable': 'systemd-analyze',
+\   'command': 'SYSTEMD_LOG_COLOR=0 %e --user verify %s',
+\   'callback': 'ale_linters#systemd#systemd_analyze#Handle',
+\   'output_stream': 'both',
+\   'lint_file': 1,
+\})
diff --git a/sources_non_forked/ale/ale_linters/terraform/terraform.vim b/sources_non_forked/ale/ale_linters/terraform/terraform.vim
index 623fc2fd..2773c340 100755
--- a/sources_non_forked/ale/ale_linters/terraform/terraform.vim
+++ b/sources_non_forked/ale/ale_linters/terraform/terraform.vim
@@ -18,6 +18,13 @@ function! ale_linters#terraform#terraform#GetType(severity) abort
     endif
 
     return 'E'
+<<<<<<< HEAD
+=======
+endfunction
+
+function! ale_linters#terraform#terraform#GetDetail(error) abort
+    return get(a:error, 'detail', get(a:error, 'summary', ''))
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 endfunction
 
 function! ale_linters#terraform#terraform#Handle(buffer, lines) abort
@@ -33,7 +40,11 @@ function! ale_linters#terraform#terraform#Handle(buffer, lines) abort
             \   'filename': ale#path#GetAbsPath(l:dir, l:error['range']['filename']),
             \   'lnum': l:error['range']['start']['line'],
             \   'col': l:error['range']['start']['column'],
+<<<<<<< HEAD
             \   'text': l:error['detail'],
+=======
+            \   'text': ale_linters#terraform#terraform#GetDetail(l:error),
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
             \   'type': ale_linters#terraform#terraform#GetType(l:error['severity']),
             \})
         else
@@ -41,7 +52,11 @@ function! ale_linters#terraform#terraform#Handle(buffer, lines) abort
             \   'filename': l:file,
             \   'lnum': 0,
             \   'col': 0,
+<<<<<<< HEAD
             \   'text': l:error['detail'],
+=======
+            \   'text': ale_linters#terraform#terraform#GetDetail(l:error),
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
             \   'type': ale_linters#terraform#terraform#GetType(l:error['severity']),
             \})
         endif
diff --git a/sources_non_forked/ale/ale_linters/terraform/tflint.vim b/sources_non_forked/ale/ale_linters/terraform/tflint.vim
index f57ee6b6..86b5b74a 100755
--- a/sources_non_forked/ale/ale_linters/terraform/tflint.vim
+++ b/sources_non_forked/ale/ale_linters/terraform/tflint.vim
@@ -91,7 +91,7 @@ function! ale_linters#terraform#tflint#GetCommand(buffer) abort
         let l:cmd .= ' ' . l:opts
     endif
 
-    let l:cmd .= ' -f json %t'
+    let l:cmd .= ' -f json'
 
     return l:cmd
 endfunction
@@ -99,6 +99,7 @@ endfunction
 call ale#linter#Define('terraform', {
 \   'name': 'tflint',
 \   'executable': {b -> ale#Var(b, 'terraform_tflint_executable')},
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#terraform#tflint#GetCommand'),
 \   'callback': 'ale_linters#terraform#tflint#Handle',
 \})
diff --git a/sources_non_forked/ale/ale_linters/tex/texlab.vim b/sources_non_forked/ale/ale_linters/tex/texlab.vim
index 5ead74b4..0794bf51 100755
--- a/sources_non_forked/ale/ale_linters/tex/texlab.vim
+++ b/sources_non_forked/ale/ale_linters/tex/texlab.vim
@@ -1,11 +1,14 @@
 " Author: Ricardo Liang <ricardoliang@gmail.com>
+" Author: ourigen <https://github.com/ourigen>
 " Description: Texlab language server (Rust rewrite)
 
 call ale#Set('tex_texlab_executable', 'texlab')
 call ale#Set('tex_texlab_options', '')
 
 function! ale_linters#tex#texlab#GetProjectRoot(buffer) abort
-    return ''
+    let l:git_path = ale#path#FindNearestDirectory(a:buffer, '.git')
+
+    return !empty(l:git_path) ? fnamemodify(l:git_path, ':h:h') : ''
 endfunction
 
 function! ale_linters#tex#texlab#GetCommand(buffer) abort
diff --git a/sources_non_forked/ale/ale_linters/typescript/eslint.vim b/sources_non_forked/ale/ale_linters/typescript/eslint.vim
index 33a21440..eaeac307 100755
--- a/sources_non_forked/ale/ale_linters/typescript/eslint.vim
+++ b/sources_non_forked/ale/ale_linters/typescript/eslint.vim
@@ -4,6 +4,7 @@
 call ale#linter#Define('typescript', {
 \   'name': 'eslint',
 \   '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/typescript/standard.vim b/sources_non_forked/ale/ale_linters/typescript/standard.vim
index da8f14eb..1d524a10 100755
--- a/sources_non_forked/ale/ale_linters/typescript/standard.vim
+++ b/sources_non_forked/ale/ale_linters/typescript/standard.vim
@@ -6,7 +6,7 @@ call ale#Set('typescript_standard_use_global', get(g:, 'ale_use_global_executabl
 call ale#Set('typescript_standard_options', '')
 
 function! ale_linters#typescript#standard#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'typescript_standard', [
+    return ale#path#FindExecutable(a:buffer, 'typescript_standard', [
     \   'node_modules/standardx/bin/cmd.js',
     \   'node_modules/standard/bin/cmd.js',
     \   'node_modules/.bin/standard',
diff --git a/sources_non_forked/ale/ale_linters/typescript/tslint.vim b/sources_non_forked/ale/ale_linters/typescript/tslint.vim
index f70c2e45..886a3cd4 100755
--- a/sources_non_forked/ale/ale_linters/typescript/tslint.vim
+++ b/sources_non_forked/ale/ale_linters/typescript/tslint.vim
@@ -59,8 +59,7 @@ function! ale_linters#typescript#tslint#GetCommand(buffer) abort
     \  ? ' -r ' . ale#Escape(l:tslint_rules_dir)
     \  : ''
 
-    return ale#path#BufferCdString(a:buffer)
-    \   . ale#Escape(ale#handlers#tslint#GetExecutable(a:buffer))
+    return ale#Escape(ale#handlers#tslint#GetExecutable(a:buffer))
     \   . ' --format json'
     \   . l:tslint_config_option
     \   . l:tslint_rules_option
@@ -70,6 +69,7 @@ endfunction
 call ale#linter#Define('typescript', {
 \   'name': 'tslint',
 \   'executable': function('ale#handlers#tslint#GetExecutable'),
+\   'cwd': '%s:h',
 \   'command': function('ale_linters#typescript#tslint#GetCommand'),
 \   'callback': 'ale_linters#typescript#tslint#Handle',
 \})
diff --git a/sources_non_forked/ale/ale_linters/typescript/tsserver.vim b/sources_non_forked/ale/ale_linters/typescript/tsserver.vim
index 4726e40d..d97becca 100755
--- a/sources_non_forked/ale/ale_linters/typescript/tsserver.vim
+++ b/sources_non_forked/ale/ale_linters/typescript/tsserver.vim
@@ -8,7 +8,7 @@ call ale#Set('typescript_tsserver_use_global', get(g:, 'ale_use_global_executabl
 call ale#linter#Define('typescript', {
 \   'name': 'tsserver',
 \   'lsp': 'tsserver',
-\   'executable': {b -> ale#node#FindExecutable(b, 'typescript_tsserver', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'typescript_tsserver', [
 \       '.yarn/sdks/typescript/bin/tsserver',
 \       'node_modules/.bin/tsserver',
 \   ])},
diff --git a/sources_non_forked/ale/ale_linters/v/v.vim b/sources_non_forked/ale/ale_linters/v/v.vim
new file mode 100644
index 00000000..afa98c56
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/v/v.vim
@@ -0,0 +1,82 @@
+" Author: fiatjaf <fiatjaf@alhur.es>
+" Description: v build for V files
+
+call ale#Set('v_v_executable', 'v')
+call ale#Set('v_v_options', '')
+
+function! ale_linters#v#v#GetCommand(buffer) abort
+    let l:options = ale#Var(a:buffer, 'v_v_options')
+
+    " Run v in local directory with relative path
+    let l:command = ale#Var(a:buffer, 'v_v_executable')
+    \   . ale#Pad(l:options)
+    \   . ' .' . ' -o /tmp/vim-ale-v'
+
+    return l:command
+endfunction
+
+function! ale_linters#v#v#Handler(buffer, lines) abort
+    let l:dir = expand('#' . a:buffer . ':p:h')
+    let l:output = []
+
+    " Matches patterns like the following:
+    "
+    " ./const.v:4:3: warning: const names cannot contain uppercase letters, use snake_case instead
+    "     2 |
+    "     3 | const (
+    "     4 |   BUTTON_TEXT = 'OK'
+    "       |   ~~~~~~~~~~~
+    "     5 | )
+    " ./main.v:4:8: warning: module 'os' is imported but never used
+    "     2 |
+    "     3 | import ui
+    "     4 | import os
+    "       |        ~~
+    "     5 |
+    "     6 | const (
+    " ./main.v:20:10: error: undefined ident: `win_widt`
+    "    18 |     mut app := &App{}
+    "    19 |     app.window = ui.window({
+    "    20 |         width: win_widt
+    "       |                ~~~~~~~~
+    "    21 |         height: win_height
+    "    22 |         title: 'Counter'
+    let l:current = {}
+
+    for l:line in a:lines
+        " matches basic error description
+        let l:match = matchlist(l:line,
+        \ '\([^:]\+\):\([^:]\+\):\([^:]\+\): \([^:]\+\): \(.*\)')
+
+        if !empty(l:match)
+            let l:current = {
+            \   'filename': ale#path#GetAbsPath(l:dir, l:match[1]),
+            \   'lnum': l:match[2] + 0,
+            \   'col': l:match[3] + 0,
+            \   'text': l:match[5],
+            \   'type': l:match[4] is# 'error' ? 'E' : 'W',
+            \}
+            call add(l:output, l:current)
+            continue
+        endif
+
+        " try to get information about the ending column
+        let l:tildematch = matchstr(l:line, '\~\+')
+
+        if !empty(l:tildematch)
+            let l:current['end_col'] = l:current['col'] + len(l:tildematch)
+        endif
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('v', {
+\   'name': 'v',
+\   'aliases': [],
+\   'executable': {b -> ale#Var(b, 'v_v_executable')},
+\   'command': function('ale_linters#v#v#GetCommand'),
+\   'output_stream': 'stderr',
+\   'callback': 'ale_linters#v#v#Handler',
+\   'lint_file': 1,
+\})
diff --git a/sources_non_forked/ale/ale_linters/vim/ale_custom_linting_rules.vim b/sources_non_forked/ale/ale_linters/vim/ale_custom_linting_rules.vim
index 822eb30a..5ca2f149 100755
--- a/sources_non_forked/ale/ale_linters/vim/ale_custom_linting_rules.vim
+++ b/sources_non_forked/ale/ale_linters/vim/ale_custom_linting_rules.vim
@@ -22,16 +22,20 @@ function! s:GetALEProjectDir(buffer) abort
     return ale#path#Dirname(ale#path#Dirname(ale#path#Dirname(l:executable)))
 endfunction
 
-function! ale_linters#vim#ale_custom_linting_rules#GetCommand(buffer) abort
-    let l:dir = s:GetALEProjectDir(a:buffer)
+function! ale_linters#vim#ale_custom_linting_rules#GetCwd(buffer) abort
+    let l:executable = ale_linters#vim#ale_custom_linting_rules#GetExecutable(a:buffer)
 
+    return ale#path#Dirname(ale#path#Dirname(ale#path#Dirname(l:executable)))
+endfunction
+
+function! ale_linters#vim#ale_custom_linting_rules#GetCommand(buffer) abort
     let l:temp_dir = ale#command#CreateDirectory(a:buffer)
     let l:temp_file = l:temp_dir . '/example.vim'
 
     let l:lines = getbufline(a:buffer, 1, '$')
     call ale#util#Writefile(a:buffer, l:lines, l:temp_file)
 
-    return ale#path#CdString(l:dir) . '%e ' . ale#Escape(l:temp_dir)
+    return '%e ' . ale#Escape(l:temp_dir)
 endfunction
 
 function! ale_linters#vim#ale_custom_linting_rules#Handle(buffer, lines) abort
@@ -59,6 +63,7 @@ endfunction
 call ale#linter#Define('vim', {
 \   'name': 'ale_custom_linting_rules',
 \   'executable': function('ale_linters#vim#ale_custom_linting_rules#GetExecutable'),
+\   'cwd': function('ale_linters#vim#ale_custom_linting_rules#GetCwd'),
 \   'command': function('ale_linters#vim#ale_custom_linting_rules#GetCommand'),
 \   'callback': 'ale_linters#vim#ale_custom_linting_rules#Handle',
 \   'read_buffer': 0,
diff --git a/sources_non_forked/ale/ale_linters/vim/vimls.vim b/sources_non_forked/ale/ale_linters/vim/vimls.vim
index 26014d66..7003eb04 100755
--- a/sources_non_forked/ale/ale_linters/vim/vimls.vim
+++ b/sources_non_forked/ale/ale_linters/vim/vimls.vim
@@ -52,7 +52,7 @@ call ale#linter#Define('vim', {
 \   'name': 'vimls',
 \   'lsp': 'stdio',
 \   'lsp_config': {b -> ale#Var(b, 'vim_vimls_config')},
-\   'executable': {b -> ale#node#FindExecutable(b, 'vim_vimls', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'vim_vimls', [
 \       'node_modules/.bin/vim-language-server',
 \   ])},
 \   'command': '%e --stdio',
diff --git a/sources_non_forked/ale/ale_linters/vue/vls.vim b/sources_non_forked/ale/ale_linters/vue/vls.vim
index ac451f3c..4bd75286 100755
--- a/sources_non_forked/ale/ale_linters/vue/vls.vim
+++ b/sources_non_forked/ale/ale_linters/vue/vls.vim
@@ -13,7 +13,7 @@ endfunction
 call ale#linter#Define('vue', {
 \   'name': 'vls',
 \   'lsp': 'stdio',
-\   'executable': {b -> ale#node#FindExecutable(b, 'vue_vls', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'vue_vls', [
 \       'node_modules/.bin/vls',
 \   ])},
 \   'command': '%e --stdio',
diff --git a/sources_non_forked/ale/ale_linters/yaml/circleci.vim b/sources_non_forked/ale/ale_linters/yaml/circleci.vim
new file mode 100644
index 00000000..3df61459
--- /dev/null
+++ b/sources_non_forked/ale/ale_linters/yaml/circleci.vim
@@ -0,0 +1,35 @@
+function! ale_linters#yaml#circleci#Handle(buffer, lines) abort
+    let l:match_index = -1
+    let l:output = []
+
+    for l:index in range(len(a:lines))
+        let l:line = a:lines[l:index]
+
+        if l:line =~? 'Error: ERROR IN CONFIG FILE:'
+            let l:match_index = l:index + 1
+            break
+        endif
+    endfor
+
+    if l:match_index > 0
+        return [{
+        \   'type': 'E',
+        \   'lnum': 1,
+        \   'text': a:lines[l:match_index],
+        \   'detail': join(a:lines[l:match_index :], "\n"),
+        \}]
+    endif
+
+    return []
+endfunction
+
+" The circleci validate requires network requests, so we'll only run it when
+" files are saved to prevent the server from being hammered.
+call ale#linter#Define('yaml', {
+\   'name': 'circleci',
+\   'executable': {b -> expand('#' . b . ':p') =~? '\.circleci' ? 'circleci' : ''},
+\   'command': 'circleci config validate - < %s',
+\   'callback': 'ale_linters#yaml#circleci#Handle',
+\   'output_stream': 'stderr',
+\   'lint_file': 1,
+\})
diff --git a/sources_non_forked/ale/ale_linters/yaml/spectral.vim b/sources_non_forked/ale/ale_linters/yaml/spectral.vim
index bd4623a5..a8c84bd2 100755
--- a/sources_non_forked/ale/ale_linters/yaml/spectral.vim
+++ b/sources_non_forked/ale/ale_linters/yaml/spectral.vim
@@ -6,7 +6,11 @@ call ale#Set('yaml_spectral_use_global', get(g:, 'ale_use_global_executables', 0
 
 call ale#linter#Define('yaml', {
 \   'name': 'spectral',
+<<<<<<< HEAD
 \   'executable': {b -> ale#node#FindExecutable(b, 'yaml_spectral', [
+=======
+\   'executable': {b -> ale#path#FindExecutable(b, 'yaml_spectral', [
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 \       'node_modules/.bin/spectral',
 \   ])},
 \   'command': '%e lint --ignore-unknown-format -q -f text %t',
diff --git a/sources_non_forked/ale/ale_linters/yaml/swaglint.vim b/sources_non_forked/ale/ale_linters/yaml/swaglint.vim
index 1f140e37..7fc2b430 100755
--- a/sources_non_forked/ale/ale_linters/yaml/swaglint.vim
+++ b/sources_non_forked/ale/ale_linters/yaml/swaglint.vim
@@ -32,7 +32,7 @@ endfunction
 
 call ale#linter#Define('yaml', {
 \   'name': 'swaglint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'yaml_swaglint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'yaml_swaglint', [
 \       'node_modules/.bin/swaglint',
 \   ])},
 \   'command': '%e -r compact --stdin',
diff --git a/sources_non_forked/ale/autoload/ale.vim b/sources_non_forked/ale/autoload/ale.vim
index 97483b45..527261d8 100755
--- a/sources_non_forked/ale/autoload/ale.vim
+++ b/sources_non_forked/ale/autoload/ale.vim
@@ -157,7 +157,23 @@ function! ale#Queue(delay, ...) abort
     endif
 endfunction
 
+<<<<<<< HEAD
 let s:current_ale_version = [3, 1, 0]
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+let s:current_ale_version = [2, 5, 0]
+=======
+let s:current_ale_version = [2, 6, 0]
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+let s:current_ale_version = [3, 0, 0]
+>>>>>>> master
+=======
+let s:current_ale_version = [3, 1, 0]
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 
 " A function used to check for ALE features in files outside of the project.
 function! ale#Has(feature) abort
diff --git a/sources_non_forked/ale/autoload/ale/ant.vim b/sources_non_forked/ale/autoload/ale/ant.vim
index 7d02484e..b6d4217f 100755
--- a/sources_non_forked/ale/autoload/ale/ant.vim
+++ b/sources_non_forked/ale/autoload/ale/ant.vim
@@ -23,19 +23,23 @@ function! ale#ant#FindExecutable(buffer) abort
     return ''
 endfunction
 
-" Given a buffer number, build a command to print the classpath of the root
-" project. Returns an empty string if cannot build the command.
+" Given a buffer number, get a working directory and command to print the
+" classpath of the root project.
+"
+" Returns an empty string for the command if Ant is not detected.
 function! ale#ant#BuildClasspathCommand(buffer) abort
     let l:executable = ale#ant#FindExecutable(a:buffer)
-    let l:project_root = ale#ant#FindProjectRoot(a:buffer)
 
-    if !empty(l:executable) && !empty(l:project_root)
-        return ale#path#CdString(l:project_root)
-        \   . ale#Escape(l:executable)
-        \   . ' classpath'
-        \   . ' -S'
-        \   . ' -q'
+    if !empty(l:executable)
+        let l:project_root = ale#ant#FindProjectRoot(a:buffer)
+
+        if !empty(l:project_root)
+            return [
+            \   l:project_root,
+            \   ale#Escape(l:executable) .' classpath -S -q'
+            \]
+        endif
     endif
 
-    return ''
+    return ['', '']
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/assert.vim b/sources_non_forked/ale/autoload/ale/assert.vim
index 934fcaa8..141cd0f2 100755
--- a/sources_non_forked/ale/autoload/ale/assert.vim
+++ b/sources_non_forked/ale/autoload/ale/assert.vim
@@ -52,6 +52,36 @@ function! s:ProcessDeferredCommands(initial_result) abort
     return l:command
 endfunction
 
+function! s:ProcessDeferredCwds(initial_command, initial_cwd) abort
+    let l:result = a:initial_command
+    let l:last_cwd = v:null
+    let l:command_index = 0
+    let l:cwd_list = []
+
+    while ale#command#IsDeferred(l:result)
+        call add(l:cwd_list, l:result.cwd)
+
+        if get(g:, 'ale_run_synchronously_emulate_commands')
+            " Don't run commands, but simulate the results.
+            let l:Callback = g:ale_run_synchronously_callbacks[0]
+            let l:output = get(s:command_output, l:command_index, [])
+            call l:Callback(0, l:output)
+            unlet g:ale_run_synchronously_callbacks
+
+            let l:command_index += 1
+        else
+            " Run the commands in the shell, synchronously.
+            call ale#test#FlushJobs()
+        endif
+
+        let l:result = l:result.value
+    endwhile
+
+    call add(l:cwd_list, a:initial_cwd is v:null ? l:last_cwd : a:initial_cwd)
+
+    return l:cwd_list
+endfunction
+
 " Load the currently loaded linter for a test case, and check that the command
 " matches the given string.
 function! ale#assert#Linter(expected_executable, expected_command) abort
@@ -85,6 +115,38 @@ function! ale#assert#Linter(expected_executable, expected_command) abort
     \   [l:executable, l:command]
 endfunction
 
+function! ale#assert#LinterCwd(expected_cwd) abort
+    let l:buffer = bufnr('')
+    let l:linter = s:GetLinter()
+
+    let l:initial_cwd = ale#linter#GetCwd(l:buffer, l:linter)
+    call ale#command#SetCwd(l:buffer, l:initial_cwd)
+
+    let l:cwd = s:ProcessDeferredCwds(
+    \   ale#linter#GetCommand(l:buffer, l:linter),
+    \   l:initial_cwd,
+    \)
+
+    call ale#command#ResetCwd(l:buffer)
+
+    if type(a:expected_cwd) isnot v:t_list
+        let l:cwd = l:cwd[-1]
+    endif
+
+    AssertEqual a:expected_cwd, l:cwd
+endfunction
+
+function! ale#assert#FixerCwd(expected_cwd) abort
+    let l:buffer = bufnr('')
+    let l:cwd = s:ProcessDeferredCwds(s:FixerFunction(l:buffer), v:null)
+
+    if type(a:expected_cwd) isnot v:t_list
+        let l:cwd = l:cwd[-1]
+    endif
+
+    AssertEqual a:expected_cwd, l:cwd
+endfunction
+
 function! ale#assert#Fixer(expected_result) abort
     let l:buffer = bufnr('')
     let l:result = s:ProcessDeferredCommands(s:FixerFunction(l:buffer))
@@ -107,8 +169,21 @@ function! ale#assert#LinterNotExecuted() abort
     let l:buffer = bufnr('')
     let l:linter = s:GetLinter()
     let l:executable = ale#linter#GetExecutable(l:buffer, l:linter)
+    let l:executed = 1
 
-    Assert empty(l:executable), "The linter will be executed when it shouldn't be"
+    if !empty(l:executable)
+        let l:command = ale#linter#GetCommand(l:buffer, l:linter)
+
+        if type(l:command) is v:t_list
+            let l:command = l:command[-1]
+        endif
+
+        let l:executed = !empty(l:command)
+    else
+        let l:executed = 0
+    endif
+
+    Assert !l:executed, "The linter will be executed when it shouldn't be"
 endfunction
 
 function! ale#assert#LSPOptions(expected_options) abort
@@ -153,6 +228,7 @@ endfunction
 
 function! ale#assert#SetUpLinterTestCommands() abort
     command! -nargs=+ GivenCommandOutput :call ale#assert#GivenCommandOutput(<args>)
+    command! -nargs=+ AssertLinterCwd :call ale#assert#LinterCwd(<args>)
     command! -nargs=+ AssertLinter :call ale#assert#Linter(<args>)
     command! -nargs=0 AssertLinterNotExecuted :call ale#assert#LinterNotExecuted()
     command! -nargs=+ AssertLSPOptions :call ale#assert#LSPOptions(<args>)
@@ -164,10 +240,35 @@ endfunction
 
 function! ale#assert#SetUpFixerTestCommands() abort
     command! -nargs=+ GivenCommandOutput :call ale#assert#GivenCommandOutput(<args>)
+    command! -nargs=+ AssertFixerCwd :call ale#assert#FixerCwd(<args>)
     command! -nargs=+ AssertFixer :call ale#assert#Fixer(<args>)
     command! -nargs=0 AssertFixerNotExecuted :call ale#assert#FixerNotExecuted()
 endfunction
 
+function! ale#assert#ResetVariables(filetype, name, ...) abort
+    " If the suffix of the option names format is different, an additional
+    " argument can be used for that instead.
+    if a:0 > 1
+        throw 'Too many arguments'
+    endif
+
+    let l:option_suffix = get(a:000, 0, a:name)
+    let l:prefix = 'ale_' . a:filetype . '_'
+    \   . substitute(l:option_suffix, '-', '_', 'g')
+    let l:filter_expr = 'v:val[: len(l:prefix) - 1] is# l:prefix'
+
+    " Save and clear linter variables.
+    " We'll load the runtime file to reset them to defaults.
+    for l:key in filter(keys(g:), l:filter_expr)
+        execute 'Save g:' . l:key
+        unlet g:[l:key]
+    endfor
+
+    for l:key in filter(keys(b:), l:filter_expr)
+        unlet b:[l:key]
+    endfor
+endfunction
+
 " A dummy function for making sure this module is loaded.
 function! ale#assert#SetUpLinterTest(filetype, name) abort
     " Set up a marker so ALE doesn't create real random temporary filenames.
@@ -177,35 +278,22 @@ function! ale#assert#SetUpLinterTest(filetype, name) abort
     call ale#linter#Reset()
     call ale#linter#PreventLoading(a:filetype)
 
-    let l:prefix = 'ale_' . a:filetype . '_' . a:name
-    let b:filter_expr = 'v:val[: len(l:prefix) - 1] is# l:prefix'
+    Save g:ale_root
+    let g:ale_root = {}
 
-    Save g:ale_lsp_root
-    let g:ale_lsp_root = {}
+    Save b:ale_root
+    unlet! b:ale_root
 
-    Save b:ale_lsp_root
-    unlet! b:ale_lsp_root
+    call ale#assert#ResetVariables(a:filetype, a:name)
 
     Save g:ale_c_build_dir
     unlet! g:ale_c_build_dir
-
-    " Save and clear linter variables.
-    " We'll load the runtime file to reset them to defaults.
-    for l:key in filter(keys(g:), b:filter_expr)
-        execute 'Save g:' . l:key
-        unlet g:[l:key]
-    endfor
-
     unlet! b:ale_c_build_dir
 
-    for l:key in filter(keys(b:), b:filter_expr)
-        unlet b:[l:key]
-    endfor
-
     execute 'runtime ale_linters/' . a:filetype . '/' . a:name . '.vim'
 
     if !exists('g:dir')
-        call ale#test#SetDirectory('/testplugin/test/command_callback')
+        call ale#test#SetDirectory('/testplugin/test/linter')
     endif
 
     call ale#assert#SetUpLinterTestCommands()
@@ -226,6 +314,10 @@ function! ale#assert#TearDownLinterTest() abort
         delcommand GivenCommandOutput
     endif
 
+    if exists(':AssertLinterCwd')
+        delcommand AssertLinterCwd
+    endif
+
     if exists(':AssertLinter')
         delcommand AssertLinter
     endif
@@ -281,18 +373,7 @@ function! ale#assert#SetUpFixerTest(filetype, name, ...) abort
     let s:FixerFunction = function(l:function_name)
 
     let l:option_suffix = get(a:000, 0, a:name)
-    let l:prefix = 'ale_' . a:filetype . '_'
-    \   . substitute(l:option_suffix, '-', '_', 'g')
-    let b:filter_expr = 'v:val[: len(l:prefix) - 1] is# l:prefix'
-
-    for l:key in filter(keys(g:), b:filter_expr)
-        execute 'Save g:' . l:key
-        unlet g:[l:key]
-    endfor
-
-    for l:key in filter(keys(b:), b:filter_expr)
-        unlet b:[l:key]
-    endfor
+    call ale#assert#ResetVariables(a:filetype, a:name, l:option_suffix)
 
     execute 'runtime autoload/ale/fixers/' . substitute(a:name, '-', '_', 'g') . '.vim'
 
@@ -329,6 +410,10 @@ function! ale#assert#TearDownFixerTest() abort
         delcommand GivenCommandOutput
     endif
 
+    if exists(':AssertFixerCwd')
+        delcommand AssertFixerCwd
+    endif
+
     if exists(':AssertFixer')
         delcommand AssertFixer
     endif
diff --git a/sources_non_forked/ale/autoload/ale/c.vim b/sources_non_forked/ale/autoload/ale/c.vim
index 14621aa9..ec9d4482 100755
--- a/sources_non_forked/ale/autoload/ale/c.vim
+++ b/sources_non_forked/ale/autoload/ale/c.vim
@@ -513,16 +513,18 @@ function! ale#c#GetMakeCommand(buffer) abort
         if !empty(l:path)
             let l:always_make = ale#Var(a:buffer, 'c_always_make')
 
-            return ale#path#CdString(fnamemodify(l:path, ':h'))
-            \   . 'make -n' . (l:always_make ? ' --always-make' : '')
+            return [
+            \   fnamemodify(l:path, ':h'),
+            \   'make -n' . (l:always_make ? ' --always-make' : ''),
+            \]
         endif
     endif
 
-    return ''
+    return ['', '']
 endfunction
 
 function! ale#c#RunMakeCommand(buffer, Callback) abort
-    let l:command = ale#c#GetMakeCommand(a:buffer)
+    let [l:cwd, l:command] = ale#c#GetMakeCommand(a:buffer)
 
     if empty(l:command)
         return a:Callback(a:buffer, [])
@@ -532,6 +534,7 @@ function! ale#c#RunMakeCommand(buffer, Callback) abort
     \   a:buffer,
     \   l:command,
     \   {b, output -> a:Callback(a:buffer, output)},
+    \   {'cwd': l:cwd},
     \)
 endfunction
 
diff --git a/sources_non_forked/ale/autoload/ale/code_action.vim b/sources_non_forked/ale/autoload/ale/code_action.vim
index 69d40933..917190be 100755
--- a/sources_non_forked/ale/autoload/ale/code_action.vim
+++ b/sources_non_forked/ale/autoload/ale/code_action.vim
@@ -71,6 +71,11 @@ function! ale#code_action#ApplyChanges(filename, changes, should_save) abort
 
     if l:buffer > 0
         let l:lines = getbufline(l:buffer, 1, '$')
+
+        " Add empty line if there's trailing newline, like readfile() does.
+        if getbufvar(l:buffer, '&eol')
+            let l:lines += ['']
+        endif
     else
         let l:lines = readfile(a:filename, 'b')
     endif
@@ -89,62 +94,82 @@ function! ale#code_action#ApplyChanges(filename, changes, should_save) abort
         let l:end_column = l:code_edit.end.offset
         let l:text = l:code_edit.newText
 
-        " Adjust the ends according to previous edits.
-        if l:end_line > len(l:lines)
-            let l:end_line_len = 0
-        else
-            let l:end_line_len = len(l:lines[l:end_line - 1])
-        endif
-
         let l:insertions = split(l:text, '\n', 1)
 
-        if l:line is 1
-            " Same logic as for column below. Vimscript's slice [:-1] will not
-            " be an empty list.
-            let l:start = []
-        else
-            let l:start = l:lines[: l:line - 2]
+        " Fix invalid columns
+        let l:column = l:column > 0 ? l:column : 1
+        let l:end_column = l:end_column > 0 ? l:end_column : 1
+
+        " Clamp start to BOF
+        if l:line < 1
+            let [l:line, l:column] = [1, 1]
         endif
 
-        " Special case when text must be added after new line
-        if l:column > len(l:lines[l:line - 1])
-            call extend(l:start, [l:lines[l:line - 1]])
-            let l:column = 1
+        " Clamp start to EOF
+        if l:line > len(l:lines) || l:line == len(l:lines) && l:column > len(l:lines[-1]) + 1
+            let [l:line, l:column] = [len(l:lines), len(l:lines[-1]) + 1]
+        " Special case when start is after EOL
+        elseif l:line < len(l:lines) && l:column > len(l:lines[l:line - 1]) + 1
+            let [l:line, l:column] = [l:line + 1, 1]
         endif
 
-        if l:column is 1
-            " We need to handle column 1 specially, because we can't slice an
-            " empty string ending on index 0.
-            let l:middle = [l:insertions[0]]
-        else
-            let l:middle = [l:lines[l:line - 1][: l:column - 2] . l:insertions[0]]
+        " Adjust end: clamp if invalid and/or adjust if we moved start
+        if l:end_line < l:line || l:end_line == l:line && l:end_column < l:column
+            let [l:end_line, l:end_column] = [l:line, l:column]
         endif
 
-        call extend(l:middle, l:insertions[1:])
-
-        if l:end_line <= len(l:lines)
-            " Only extend the last line if end_line is within the range of
-            " lines.
-            let l:middle[-1] .= l:lines[l:end_line - 1][l:end_column - 1 :]
+        " Clamp end to EOF
+        if l:end_line > len(l:lines) || l:end_line == len(l:lines) && l:end_column > len(l:lines[-1]) + 1
+            let [l:end_line, l:end_column] = [len(l:lines), len(l:lines[-1]) + 1]
+        " Special case when end is after EOL
+        elseif l:end_line < len(l:lines) && l:end_column > len(l:lines[l:end_line - 1]) + 1
+            let [l:end_line, l:end_column] = [l:end_line + 1, 1]
         endif
 
+        " Careful, [:-1] is not an empty list
+        let l:start = l:line is 1 ? [] : l:lines[: l:line - 2]
+        let l:middle = l:column is 1 ? [''] : [l:lines[l:line - 1][: l:column - 2]]
+
+        let l:middle[-1] .= l:insertions[0]
+        let l:middle     += l:insertions[1:]
+        let l:middle[-1] .= l:lines[l:end_line - 1][l:end_column - 1 :]
+
+        let l:end_line_len = len(l:lines[l:end_line - 1])
         let l:lines_before_change = len(l:lines)
         let l:lines = l:start + l:middle + l:lines[l:end_line :]
 
         let l:current_line_offset = len(l:lines) - l:lines_before_change
         let l:column_offset = len(l:middle[-1]) - l:end_line_len
 
-        let l:pos = s:UpdateCursor(l:pos,
-        \ [l:line, l:column],
-        \ [l:end_line, l:end_column],
-        \ [l:current_line_offset, l:column_offset])
+        " Keep cursor where it was (if outside of changes) or move it after
+        " the changed text (if inside), but don't touch it when the change
+        " spans the entire buffer, in which case we have no clue and it's
+        " better to not do anything.
+        if l:line isnot 1 || l:column isnot 1
+        \|| l:end_line < l:lines_before_change
+        \|| l:end_line == l:lines_before_change && l:end_column <= l:end_line_len
+            let l:pos = s:UpdateCursor(l:pos,
+            \ [l:line, l:column],
+            \ [l:end_line, l:end_column],
+            \ [l:current_line_offset, l:column_offset])
+        endif
     endfor
 
-    if l:lines[-1] is# ''
+    if l:buffer > 0
+        " Make sure ale#util#{Writefile,SetBufferContents} add trailing
+        " newline if and only if it should be added.
+        if l:lines[-1] is# '' && getbufvar(l:buffer, '&eol')
+            call remove(l:lines, -1)
+        else
+            call setbufvar(l:buffer, '&eol', 0)
+        endif
+    elseif exists('+fixeol') && &fixeol && l:lines[-1] is# ''
+        " Not in buffer, ale#util#Writefile can't check &eol and always adds
+        " newline if &fixeol: remove to prevent double trailing newline.
         call remove(l:lines, -1)
     endif
 
-    if a:should_save
+    if a:should_save || l:buffer < 0
         call ale#util#Writefile(l:buffer, l:lines, a:filename)
     else
         call ale#util#SetBufferContents(l:buffer, l:lines)
@@ -222,6 +247,10 @@ function! s:UpdateCursor(cursor, start, end, offset) abort
 endfunction
 
 function! ale#code_action#GetChanges(workspace_edit) abort
+    if a:workspace_edit is v:null
+        return {}
+    endif
+
     let l:changes = {}
 
     if has_key(a:workspace_edit, 'changes') && !empty(a:workspace_edit.changes)
diff --git a/sources_non_forked/ale/autoload/ale/command.vim b/sources_non_forked/ale/autoload/ale/command.vim
index 8f497169..c9dc8d94 100755
--- a/sources_non_forked/ale/autoload/ale/command.vim
+++ b/sources_non_forked/ale/autoload/ale/command.vim
@@ -7,6 +7,9 @@ if !exists('s:buffer_data')
     let s:buffer_data = {}
 endif
 
+" The regular expression used for formatting filenames with modifiers.
+let s:path_format_regex = '\v\%s(%(:h|:t|:r|:e)*)'
+
 " Used to get the data in tests.
 function! ale#command#GetData() abort
     return deepcopy(s:buffer_data)
@@ -26,6 +29,19 @@ function! ale#command#InitData(buffer) abort
     endif
 endfunction
 
+" Set the cwd for commands that are about to run.
+" Used internally.
+function! ale#command#SetCwd(buffer, cwd) abort
+    call ale#command#InitData(a:buffer)
+    let s:buffer_data[a:buffer].cwd = a:cwd
+endfunction
+
+function! ale#command#ResetCwd(buffer) abort
+    if has_key(s:buffer_data, a:buffer)
+        let s:buffer_data[a:buffer].cwd = v:null
+    endif
+endfunction
+
 function! ale#command#ManageFile(buffer, file) abort
     call ale#command#InitData(a:buffer)
     call add(s:buffer_data[a:buffer].file_list, a:file)
@@ -151,6 +167,24 @@ function! s:FormatFilename(filename, mappings, modifiers) abort
     return ale#Escape(l:filename)
 endfunction
 
+" Produce a command prefix to check to a particular directory for a command.
+" %s format markers with filename-modifiers can be used as the directory, and
+" will be returned verbatim for formatting in paths relative to files.
+function! ale#command#CdString(directory) abort
+    let l:match = matchstrpos(a:directory, s:path_format_regex)
+    " Do not escape the directory here if it's a valid format string.
+    " This allows us to use sequences like %s:h, %s:h:h, etc.
+    let l:directory = l:match[1:] == [0, len(a:directory)]
+    \   ? a:directory
+    \   : ale#Escape(a:directory)
+
+    if has('win32')
+        return 'cd /d ' . l:directory . ' && '
+    endif
+
+    return 'cd ' . l:directory . ' && '
+endfunction
+
 " Given a command string, replace every...
 " %s -> with the current filename
 " %t -> with the name of an unused file in a temporary directory
@@ -161,11 +195,16 @@ function! ale#command#FormatCommand(
 \   command,
 \   pipe_file_if_needed,
 \   input,
+\   cwd,
 \   mappings,
 \) abort
     let l:temporary_file = ''
     let l:command = a:command
 
+    if !empty(a:cwd)
+        let l:command = ale#command#CdString(a:cwd) . l:command
+    endif
+
     " First replace all uses of %%, used for literal percent characters,
     " with an ugly string.
     let l:command = substitute(l:command, '%%', '<<PERCENTS>>', 'g')
@@ -181,7 +220,7 @@ function! ale#command#FormatCommand(
         let l:filename = fnamemodify(bufname(a:buffer), ':p')
         let l:command = substitute(
         \   l:command,
-        \   '\v\%s(%(:h|:t|:r|:e)*)',
+        \   s:path_format_regex,
         \   '\=s:FormatFilename(l:filename, a:mappings, submatch(1))',
         \   'g'
         \)
@@ -279,9 +318,16 @@ function! s:ExitCallback(buffer, line_list, Callback, data) abort
     let l:result = a:data.result
     let l:result.value = l:value
 
-    if get(l:result, 'result_callback', v:null) isnot v:null
-        call call(l:result.result_callback, [l:value])
-    endif
+    " Set the default cwd for this buffer in this call stack.
+    call ale#command#SetCwd(a:buffer, l:result.cwd)
+
+    try
+        if get(l:result, 'result_callback', v:null) isnot v:null
+            call call(l:result.result_callback, [l:value])
+        endif
+    finally
+        call ale#command#ResetCwd(a:buffer)
+    endtry
 endfunction
 
 function! ale#command#Run(buffer, command, Callback, ...) abort
@@ -293,6 +339,13 @@ function! ale#command#Run(buffer, command, Callback, ...) abort
 
     let l:output_stream = get(l:options, 'output_stream', 'stdout')
     let l:line_list = []
+    let l:cwd = get(l:options, 'cwd', v:null)
+
+    if l:cwd is v:null
+        " Default the working directory to whatever it was for the last
+        " command run in the chain.
+        let l:cwd = get(get(s:buffer_data, a:buffer, {}), 'cwd', v:null)
+    endif
 
     let [l:temporary_file, l:command, l:file_created] = ale#command#FormatCommand(
     \   a:buffer,
@@ -300,6 +353,7 @@ function! ale#command#Run(buffer, command, Callback, ...) abort
     \   a:command,
     \   get(l:options, 'read_buffer', 0),
     \   get(l:options, 'input', v:null),
+    \   l:cwd,
     \   get(l:options, 'filename_mappings', []),
     \)
     let l:command = ale#job#PrepareCommand(a:buffer, l:command)
@@ -366,10 +420,14 @@ function! ale#command#Run(buffer, command, Callback, ...) abort
     " The `_deferred_job_id` is used for both checking the type of object, and
     " for checking the job ID and status.
     "
+    " The cwd is kept and used as the default value for the next command in
+    " the chain.
+    "
     " The original command here is used in tests.
     let l:result = {
     \   '_deferred_job_id': l:job_id,
     \   'executable': get(l:options, 'executable', ''),
+    \   'cwd': l:cwd,
     \   'command': a:command,
     \}
 
diff --git a/sources_non_forked/ale/autoload/ale/completion.vim b/sources_non_forked/ale/autoload/ale/completion.vim
index 332d0734..4cf3a51a 100755
--- a/sources_non_forked/ale/autoload/ale/completion.vim
+++ b/sources_non_forked/ale/autoload/ale/completion.vim
@@ -269,13 +269,19 @@ function! s:ReplaceCompletionOptions(source) abort
             let b:ale_old_completeopt = &l:completeopt
         endif
 
-        if &l:completeopt =~# 'preview'
-            let &l:completeopt = 'menu,menuone,preview,noselect,noinsert'
-        elseif &l:completeopt =~# 'popup'
-            let &l:completeopt = 'menu,menuone,popup,noselect,noinsert'
-        else
-            let &l:completeopt = 'menu,menuone,noselect,noinsert'
-        endif
+        let l:opt_list = split(&l:completeopt, ',')
+        " The menu and noinsert options must be set, or automatic completion
+        " will be annoying.
+        let l:new_opt_list = ['menu', 'menuone', 'noinsert']
+
+        " Permit some other completion options, provided users have set them.
+        for l:opt in ['preview', 'popup', 'noselect']
+            if index(l:opt_list, l:opt) >= 0
+                call add(l:new_opt_list, l:opt)
+            endif
+        endfor
+
+        let &l:completeopt = join(l:new_opt_list, ',')
     endif
 endfunction
 
diff --git a/sources_non_forked/ale/autoload/ale/debugging.vim b/sources_non_forked/ale/autoload/ale/debugging.vim
index 5e6d5906..efd52776 100755
--- a/sources_non_forked/ale/autoload/ale/debugging.vim
+++ b/sources_non_forked/ale/autoload/ale/debugging.vim
@@ -33,13 +33,13 @@ let s:global_variable_list = [
 \    'ale_list_vertical',
 \    'ale_list_window_size',
 \    'ale_loclist_msg_format',
-\    'ale_lsp_root',
 \    'ale_max_buffer_history_size',
 \    'ale_max_signs',
 \    'ale_maximum_file_size',
 \    'ale_open_list',
 \    'ale_pattern_options',
 \    'ale_pattern_options_enabled',
+\    'ale_root',
 \    'ale_set_balloons',
 \    'ale_set_highlights',
 \    'ale_set_loclist',
@@ -259,9 +259,7 @@ function! ale#debugging#InfoToClipboard() abort
         return
     endif
 
-    redir => l:output
-        silent call ale#debugging#Info()
-    redir END
+    let l:output = execute('call ale#debugging#Info()')
 
     let @+ = l:output
     call s:Echo('ALEInfo copied to your clipboard')
@@ -270,9 +268,7 @@ endfunction
 function! ale#debugging#InfoToFile(filename) abort
     let l:expanded_filename = expand(a:filename)
 
-    redir => l:output
-        silent call ale#debugging#Info()
-    redir END
+    let l:output = execute('call ale#debugging#Info()')
 
     call writefile(split(l:output, "\n"), l:expanded_filename)
     call s:Echo('ALEInfo written to ' . l:expanded_filename)
diff --git a/sources_non_forked/ale/autoload/ale/definition.vim b/sources_non_forked/ale/autoload/ale/definition.vim
index 0c1fb7cf..9574017b 100755
--- a/sources_non_forked/ale/autoload/ale/definition.vim
+++ b/sources_non_forked/ale/autoload/ale/definition.vim
@@ -36,7 +36,7 @@ function! ale#definition#UpdateTagStack() abort
 endfunction
 
 function! ale#definition#HandleTSServerResponse(conn_id, response) abort
-    if get(a:response, 'command', '') is# 'definition'
+    if has_key(a:response, 'request_seq')
     \&& has_key(s:go_to_definition_map, a:response.request_seq)
         let l:options = remove(s:go_to_definition_map, a:response.request_seq)
 
@@ -66,9 +66,17 @@ function! ale#definition#HandleLSPResponse(conn_id, response) abort
         endif
 
         for l:item in l:result
-            let l:filename = ale#path#FromURI(l:item.uri)
-            let l:line = l:item.range.start.line + 1
-            let l:column = l:item.range.start.character + 1
+            if has_key(l:item, 'targetUri')
+                " LocationLink items use targetUri
+                let l:filename = ale#path#FromURI(l:item.targetUri)
+                let l:line = l:item.targetRange.start.line + 1
+                let l:column = l:item.targetRange.start.character + 1
+            else
+                " LocationLink items use uri
+                let l:filename = ale#path#FromURI(l:item.uri)
+                let l:line = l:item.range.start.line + 1
+                let l:column = l:item.range.start.character + 1
+            endif
 
             call ale#definition#UpdateTagStack()
             call ale#util#Open(l:filename, l:line, l:column, l:options)
@@ -92,11 +100,19 @@ function! s:OnReady(line, column, options, capability, linter, lsp_details) abor
     call ale#lsp#RegisterCallback(l:id, l:Callback)
 
     if a:linter.lsp is# 'tsserver'
-        let l:message = ale#lsp#tsserver_message#Definition(
-        \   l:buffer,
-        \   a:line,
-        \   a:column
-        \)
+        if a:capability is# 'definition'
+            let l:message = ale#lsp#tsserver_message#Definition(
+            \   l:buffer,
+            \   a:line,
+            \   a:column
+            \)
+        elseif a:capability is# 'typeDefinition'
+            let l:message = ale#lsp#tsserver_message#TypeDefinition(
+            \   l:buffer,
+            \   a:line,
+            \   a:column
+            \)
+        endif
     else
         " Send a message saying the buffer has changed first, or the
         " definition position probably won't make sense.
@@ -145,12 +161,6 @@ endfunction
 function! ale#definition#GoToType(options) abort
     for l:linter in ale#linter#Get(&filetype)
         if !empty(l:linter.lsp)
-            " TODO: handle typeDefinition for tsserver if supported by the
-            " protocol
-            if l:linter.lsp is# 'tsserver'
-                continue
-            endif
-
             call s:GoToLSPDefinition(l:linter, a:options, 'typeDefinition')
         endif
     endfor
diff --git a/sources_non_forked/ale/autoload/ale/engine.vim b/sources_non_forked/ale/autoload/ale/engine.vim
index 3cafa25c..5b9b1fca 100755
--- a/sources_non_forked/ale/autoload/ale/engine.vim
+++ b/sources_non_forked/ale/autoload/ale/engine.vim
@@ -413,6 +413,7 @@ function! s:RunJob(command, options) abort
         return 0
     endif
 
+    let l:cwd = a:options.cwd
     let l:executable = a:options.executable
     let l:buffer = a:options.buffer
     let l:linter = a:options.linter
@@ -425,6 +426,7 @@ function! s:RunJob(command, options) abort
     \   'executable': l:executable,
     \}])
     let l:result = ale#command#Run(l:buffer, l:command, l:Callback, {
+    \   'cwd': l:cwd,
     \   'output_stream': l:output_stream,
     \   'executable': l:executable,
     \   'read_buffer': l:read_buffer,
@@ -541,8 +543,22 @@ function! s:RunIfExecutable(buffer, linter, lint_file, executable) abort
         let l:job_type = a:lint_file ? 'file_linter' : 'linter'
         call setbufvar(a:buffer, 'ale_job_type', l:job_type)
 
+        " Get the cwd for the linter and set it before we call GetCommand.
+        " This will ensure that ale#command#Run uses it by default.
+        let l:cwd = ale#linter#GetCwd(a:buffer, a:linter)
+
+        if l:cwd isnot v:null
+            call ale#command#SetCwd(a:buffer, l:cwd)
+        endif
+
         let l:command = ale#linter#GetCommand(a:buffer, a:linter)
+
+        if l:cwd isnot v:null
+            call ale#command#ResetCwd(a:buffer)
+        endif
+
         let l:options = {
+        \   'cwd': l:cwd,
         \   'executable': a:executable,
         \   'buffer': a:buffer,
         \   'linter': a:linter,
diff --git a/sources_non_forked/ale/autoload/ale/filetypes.vim b/sources_non_forked/ale/autoload/ale/filetypes.vim
index 6cdc9ece..340a9c4e 100755
--- a/sources_non_forked/ale/autoload/ale/filetypes.vim
+++ b/sources_non_forked/ale/autoload/ale/filetypes.vim
@@ -4,9 +4,7 @@
 function! ale#filetypes#LoadExtensionMap() abort
     " Output includes:
     "    '*.erl setf erlang'
-    redir => l:output
-        silent exec 'autocmd'
-    redir end
+    let l:output = execute('exec "autocmd"')
 
     let l:map = {}
 
diff --git a/sources_non_forked/ale/autoload/ale/fix.vim b/sources_non_forked/ale/autoload/ale/fix.vim
index c3338fc5..8ebba9fe 100755
--- a/sources_non_forked/ale/autoload/ale/fix.vim
+++ b/sources_non_forked/ale/autoload/ale/fix.vim
@@ -172,6 +172,7 @@ function! s:RunJob(result, options) abort
     let l:read_temporary_file = get(a:result, 'read_temporary_file', 0)
     let l:read_buffer = get(a:result, 'read_buffer', 1)
     let l:output_stream = get(a:result, 'output_stream', 'stdout')
+    let l:cwd = get(a:result, 'cwd', v:null)
 
     if l:read_temporary_file
         let l:output_stream = 'none'
@@ -190,6 +191,7 @@ function! s:RunJob(result, options) abort
     \   'read_buffer': l:read_buffer,
     \   'input': l:input,
     \   'log_output': 0,
+    \   'cwd': l:cwd,
     \   'filename_mappings': ale#GetFilenameMappings(l:buffer, l:fixer_name),
     \})
 
diff --git a/sources_non_forked/ale/autoload/ale/fix/registry.vim b/sources_non_forked/ale/autoload/ale/fix/registry.vim
index 8279fdb4..a80e5c2c 100755
--- a/sources_non_forked/ale/autoload/ale/fix/registry.vim
+++ b/sources_non_forked/ale/autoload/ale/fix/registry.vim
@@ -32,6 +32,14 @@ let s:default_registry = {
 \       'suggested_filetypes': ['python'],
 \       'description': 'Fix PEP8 issues with black.',
 \   },
+<<<<<<< HEAD
+=======
+\   'buildifier': {
+\       'function': 'ale#fixers#buildifier#Fix',
+\       'suggested_filetypes': ['bzl'],
+\       'description': 'Format BUILD and .bzl files with buildifier.',
+\   },
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 \   'deno': {
 \       'function': 'ale#fixers#deno#Fix',
 \       'suggested_filetypes': ['typescript'],
@@ -107,7 +115,11 @@ let s:default_registry = {
 \   },
 \   'prettier': {
 \       'function': 'ale#fixers#prettier#Fix',
+<<<<<<< HEAD
 \       'suggested_filetypes': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'json5', 'graphql', 'markdown', 'vue', 'html', 'yaml', 'openapi', 'ruby'],
+=======
+\       'suggested_filetypes': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'json5', 'graphql', 'markdown', 'vue', 'svelte', 'html', 'yaml', 'openapi', 'ruby'],
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 \       'description': 'Apply prettier to a file.',
 \   },
 \   'prettier_eslint': {
@@ -186,6 +198,11 @@ let s:default_registry = {
 \       'suggested_filetypes': ['swift'],
 \       'description': 'Apply SwiftFormat to a file.',
 \   },
+\   'apple-swift-format': {
+\       'function': 'ale#fixers#appleswiftformat#Fix',
+\       'suggested_filetypes': ['swift'],
+\       'description': 'Apply apple/swift-format to a file.',
+\   },
 \   'phpcbf': {
 \       'function': 'ale#fixers#phpcbf#Fix',
 \       'suggested_filetypes': ['php'],
@@ -293,12 +310,12 @@ let s:default_registry = {
 \   },
 \   'ocamlformat': {
 \       'function': 'ale#fixers#ocamlformat#Fix',
-\       'suggested_filetypes': ['ocaml'],
+\       'suggested_filetypes': ['ocaml', 'ocamlinterface'],
 \       'description': 'Fix OCaml files with ocamlformat.',
 \   },
 \   'ocp-indent': {
 \       'function': 'ale#fixers#ocp_indent#Fix',
-\       'suggested_filetypes': ['ocaml'],
+\       'suggested_filetypes': ['ocaml', 'ocamlinterface'],
 \       'description': 'Fix OCaml files with ocp-indent.',
 \   },
 \   'refmt': {
@@ -336,6 +353,11 @@ let s:default_registry = {
 \       'suggested_filetypes': ['json'],
 \       'description': 'Fix JSON files with jq.',
 \   },
+\   'protolint': {
+\       'function': 'ale#fixers#protolint#Fix',
+\       'suggested_filetypes': ['proto'],
+\       'description': 'Fix Protocol Buffer files with protolint.',
+\   },
 \   'perltidy': {
 \       'function': 'ale#fixers#perltidy#Fix',
 \       'suggested_filetypes': ['perl'],
@@ -401,6 +423,11 @@ let s:default_registry = {
 \       'suggested_filetypes': ['ada'],
 \       'description': 'Format Ada files with gnatpp.',
 \   },
+\   'nixfmt': {
+\       'function': 'ale#fixers#nixfmt#Fix',
+\       'suggested_filetypes': ['nix'],
+\       'description': 'A nix formatter written in Haskell.',
+\   },
 \   'nixpkgs-fmt': {
 \       'function': 'ale#fixers#nixpkgsfmt#Fix',
 \       'suggested_filetypes': ['nix'],
@@ -425,6 +452,19 @@ let s:default_registry = {
 \       'function': 'ale#fixers#ormolu#Fix',
 \       'suggested_filetypes': ['haskell'],
 \       'description': 'A formatter for Haskell source code.',
+<<<<<<< HEAD
+=======
+\   },
+\   'ptop': {
+\       'function': 'ale#fixers#ptop#Fix',
+\       'suggested_filetypes': ['pascal'],
+\       'description': 'Fix Pascal files with ptop.',
+\   },
+\   'vfmt': {
+\       'function': 'ale#fixers#vfmt#Fix',
+\       'suggested_filetypes': ['v'],
+\       'description': 'A formatter for V source code.',
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 \   }
 \}
 
diff --git a/sources_non_forked/ale/autoload/ale/fixers/appleswiftformat.vim b/sources_non_forked/ale/autoload/ale/fixers/appleswiftformat.vim
new file mode 100644
index 00000000..ca27e82c
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/appleswiftformat.vim
@@ -0,0 +1,16 @@
+" Author: (bosr) <bosr@bosr.cc>
+" Description: Integration of apple/swift-format formatter with ALE.
+
+function! ale#fixers#appleswiftformat#Fix(buffer) abort
+    let l:command_args = ale#swift#GetAppleSwiftFormatCommand(a:buffer) . ' format --in-place %t'
+    let l:config_args = ale#swift#GetAppleSwiftFormatConfigArgs(a:buffer)
+
+    if l:config_args isnot# ''
+        let l:command_args = l:command_args . ' ' . l:config_args
+    endif
+
+    return {
+    \   'read_temporary_file': 1,
+    \   'command': l:command_args,
+    \}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/autoimport.vim b/sources_non_forked/ale/autoload/ale/fixers/autoimport.vim
index 37a52db8..700d36b5 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/autoimport.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/autoimport.vim
@@ -19,7 +19,9 @@ function! ale#fixers#autoimport#Fix(buffer) abort
     endif
 
     return {
-    \   'command': ale#path#BufferCdString(a:buffer)
-    \   .   ale#Escape(l:executable) . (!empty(l:options) ? ' ' . l:options : '') . ' -',
+    \   'cwd': '%s:h',
+    \   'command': ale#Escape(l:executable)
+    \       . (!empty(l:options) ? ' ' . l:options : '')
+    \       . ' -',
     \}
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/black.vim b/sources_non_forked/ale/autoload/ale/fixers/black.vim
index fba6c3b4..17697652 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/black.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/black.vim
@@ -17,25 +17,25 @@ function! ale#fixers#black#GetExecutable(buffer) abort
 endfunction
 
 function! ale#fixers#black#Fix(buffer) abort
-    let l:cd_string = ale#Var(a:buffer, 'python_black_change_directory')
-    \   ? ale#path#BufferCdString(a:buffer)
-    \   : ''
-
     let l:executable = ale#fixers#black#GetExecutable(a:buffer)
-
     let l:exec_args = l:executable =~? 'pipenv$'
     \   ? ' run black'
     \   : ''
-
     let l:options = ale#Var(a:buffer, 'python_black_options')
 
     if expand('#' . a:buffer . ':e') is? 'pyi'
         let l:options .= '--pyi'
     endif
 
-    return {
-    \   'command': l:cd_string . ale#Escape(l:executable) . l:exec_args
+    let l:result = {
+    \   'command': ale#Escape(l:executable) . l:exec_args
     \       . (!empty(l:options) ? ' ' . l:options : '')
     \       . ' -',
     \}
+
+    if ale#Var(a:buffer, 'python_black_change_directory')
+        let l:result.cwd = '%s:h'
+    endif
+
+    return l:result
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/buildifier.vim b/sources_non_forked/ale/autoload/ale/fixers/buildifier.vim
new file mode 100644
index 00000000..48103b2e
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/buildifier.vim
@@ -0,0 +1,26 @@
+" Author: Jon Parise <jon@indelible.org>
+" Description: Format Bazel BUILD and .bzl files with buildifier.
+"
+call ale#Set('bazel_buildifier_executable', 'buildifier')
+call ale#Set('bazel_buildifier_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('bazel_buildifier_options', '')
+
+function! ale#fixers#buildifier#GetExecutable(buffer) abort
+    return ale#path#FindExecutable(a:buffer, 'bazel_buildifier', [
+    \   'buildifier',
+    \])
+endfunction
+
+function! ale#fixers#buildifier#Fix(buffer) abort
+    let l:executable = ale#Escape(ale#fixers#buildifier#GetExecutable(a:buffer))
+    let l:options = ale#Var(a:buffer, 'bazel_buildifier_options')
+    let l:filename = ale#Escape(bufname(a:buffer))
+
+    let l:command = l:executable . ' -mode fix -lint fix -path ' . l:filename
+
+    if l:options isnot# ''
+        let l:command .= ' ' . l:options
+    endif
+
+    return {'command': l:command . ' -'}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/clangformat.vim b/sources_non_forked/ale/autoload/ale/fixers/clangformat.vim
index ecff080a..81498ebd 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/clangformat.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/clangformat.vim
@@ -9,7 +9,7 @@ call ale#Set('c_clangformat_style_option', '')
 call ale#Set('c_clangformat_use_local_file', 0)
 
 function! ale#fixers#clangformat#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'c_clangformat', [
+    return ale#path#FindExecutable(a:buffer, 'c_clangformat', [
     \   'clang-format',
     \])
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/cmakeformat.vim b/sources_non_forked/ale/autoload/ale/fixers/cmakeformat.vim
index f40ed6ed..dcc29cf3 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/cmakeformat.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/cmakeformat.vim
@@ -10,9 +10,7 @@ function! ale#fixers#cmakeformat#Fix(buffer) abort
 
     return {
     \   'command': ale#Escape(l:executable)
-    \       . ' -i '
     \       . (empty(l:options) ? '' : ' ' . l:options)
-    \       . ' %t',
-    \   'read_temporary_file': 1,
+    \       . ' -'
     \}
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/elm_format.vim b/sources_non_forked/ale/autoload/ale/fixers/elm_format.vim
index cd2be2c3..a4740db4 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/elm_format.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/elm_format.vim
@@ -6,7 +6,7 @@ call ale#Set('elm_format_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('elm_format_options', '--yes')
 
 function! ale#fixers#elm_format#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'elm_format', [
+    return ale#path#FindExecutable(a:buffer, 'elm_format', [
     \   'node_modules/.bin/elm-format',
     \])
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/erlfmt.vim b/sources_non_forked/ale/autoload/ale/fixers/erlfmt.vim
new file mode 100644
index 00000000..f9951e9d
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/erlfmt.vim
@@ -0,0 +1,21 @@
+" Author: AntoineGagne - https://github.com/AntoineGagne
+" Description: Integration of erlfmt with ALE.
+
+call ale#Set('erlang_erlfmt_executable', 'erlfmt')
+call ale#Set('erlang_erlfmt_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('erlang_erlfmt_options', '')
+
+function! ale#fixers#erlfmt#GetExecutable(buffer) abort
+    return ale#path#FindExecutable(a:buffer, 'erlang_erlfmt', ['erlfmt'])
+endfunction
+
+function! ale#fixers#erlfmt#Fix(buffer) abort
+    let l:options = ale#Var(a:buffer, 'erlang_erlfmt_options')
+    let l:executable = ale#fixers#erlfmt#GetExecutable(a:buffer)
+
+    let l:command = ale#Escape(l:executable) . (empty(l:options) ? '' : ' ' . l:options) . ' %s'
+
+    return {
+    \   'command': l:command
+    \}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/eslint.vim b/sources_non_forked/ale/autoload/ale/fixers/eslint.vim
index f725875c..c9535cb0 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/eslint.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/eslint.vim
@@ -53,8 +53,8 @@ function! ale#fixers#eslint#ApplyFixForVersion(buffer, version) abort
     " Use --fix-to-stdout with eslint_d
     if l:executable =~# 'eslint_d$' && ale#semver#GTE(a:version, [3, 19, 0])
         return {
-        \   'command': ale#handlers#eslint#GetCdString(a:buffer)
-        \       . ale#node#Executable(a:buffer, l:executable)
+        \   'cwd': ale#handlers#eslint#GetCwd(a:buffer),
+        \   'command': ale#node#Executable(a:buffer, l:executable)
         \       . ale#Pad(l:options)
         \       . ' --stdin-filename %s --stdin --fix-to-stdout',
         \   'process_with': 'ale#fixers#eslint#ProcessEslintDOutput',
@@ -64,8 +64,8 @@ function! ale#fixers#eslint#ApplyFixForVersion(buffer, version) abort
     " 4.9.0 is the first version with --fix-dry-run
     if ale#semver#GTE(a:version, [4, 9, 0])
         return {
-        \   'command': ale#handlers#eslint#GetCdString(a:buffer)
-        \       . ale#node#Executable(a:buffer, l:executable)
+        \   'cwd': ale#handlers#eslint#GetCwd(a:buffer),
+        \   'command': ale#node#Executable(a:buffer, l:executable)
         \       . ale#Pad(l:options)
         \       . ' --stdin-filename %s --stdin --fix-dry-run --format=json',
         \   'process_with': 'ale#fixers#eslint#ProcessFixDryRunOutput',
@@ -73,8 +73,8 @@ function! ale#fixers#eslint#ApplyFixForVersion(buffer, version) abort
     endif
 
     return {
-    \   'command': ale#handlers#eslint#GetCdString(a:buffer)
-    \       . ale#node#Executable(a:buffer, l:executable)
+    \   'cwd': ale#handlers#eslint#GetCwd(a:buffer),
+    \   'command': ale#node#Executable(a:buffer, l:executable)
     \       . ale#Pad(l:options)
     \       . (!empty(l:config) ? ' -c ' . ale#Escape(l:config) : '')
     \       . ' --fix %t',
diff --git a/sources_non_forked/ale/autoload/ale/fixers/fixjson.vim b/sources_non_forked/ale/autoload/ale/fixers/fixjson.vim
index 33ce0af3..4bad8f9b 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/fixjson.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/fixjson.vim
@@ -6,7 +6,7 @@ call ale#Set('json_fixjson_options', '')
 call ale#Set('json_fixjson_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale#fixers#fixjson#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'json_fixjson', [
+    return ale#path#FindExecutable(a:buffer, 'json_fixjson', [
     \   'node_modules/.bin/fixjson',
     \])
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/isort.vim b/sources_non_forked/ale/autoload/ale/fixers/isort.vim
index 55bb550e..2db81182 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/isort.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/isort.vim
@@ -17,20 +17,32 @@ 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'
+    \   : ''
 
+<<<<<<< HEAD
     let l:executable = ale#fixers#isort#GetExecutable(a:buffer)
 
     let l:exec_args = l:executable =~? 'pipenv$'
     \   ? ' run isort'
     \   : ''
 
+=======
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     if !executable(l:executable) && l:executable isnot# 'pipenv'
         return 0
     endif
 
     return {
+<<<<<<< HEAD
     \   'command': ale#path#BufferCdString(a:buffer)
     \   . ale#Escape(l:executable) . l:exec_args
+=======
+    \   'cwd': '%s:h',
+    \   'command': ale#Escape(l:executable) . l:exec_args
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     \   . (!empty(l:options) ? ' ' . l:options : '') . ' -',
     \}
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/nixfmt.vim b/sources_non_forked/ale/autoload/ale/fixers/nixfmt.vim
new file mode 100644
index 00000000..4a548b23
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/nixfmt.vim
@@ -0,0 +1,15 @@
+scriptencoding utf-8
+" Author: houstdav000 <houstdav000@gh0st.sh>
+" Description: Fix files with nixfmt
+
+call ale#Set('nix_nixfmt_executable', 'nixfmt')
+call ale#Set('nix_nixfmt_options', '')
+
+function! ale#fixers#nixfmt#Fix(buffer) abort
+    let l:executable = ale#Var(a:buffer, 'nix_nixfmt_executable')
+    let l:options = ale#Var(a:buffer, 'nix_nixfmt_options')
+
+    return {
+    \   'command': ale#Escape(l:executable) . ale#Pad(l:options),
+    \}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/php_cs_fixer.vim b/sources_non_forked/ale/autoload/ale/fixers/php_cs_fixer.vim
index 5c59e262..c8f9c7b0 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/php_cs_fixer.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/php_cs_fixer.vim
@@ -6,7 +6,7 @@ call ale#Set('php_cs_fixer_use_global', get(g:, 'ale_use_global_executables', 0)
 call ale#Set('php_cs_fixer_options', '')
 
 function! ale#fixers#php_cs_fixer#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'php_cs_fixer', [
+    return ale#path#FindExecutable(a:buffer, 'php_cs_fixer', [
     \   'vendor/bin/php-cs-fixer',
     \   'php-cs-fixer'
     \])
diff --git a/sources_non_forked/ale/autoload/ale/fixers/phpcbf.vim b/sources_non_forked/ale/autoload/ale/fixers/phpcbf.vim
index 0a61c657..494bf346 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/phpcbf.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/phpcbf.vim
@@ -7,7 +7,7 @@ call ale#Set('php_phpcbf_executable', 'phpcbf')
 call ale#Set('php_phpcbf_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale#fixers#phpcbf#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'php_phpcbf', [
+    return ale#path#FindExecutable(a:buffer, 'php_phpcbf', [
     \   'vendor/bin/phpcbf',
     \   'phpcbf'
     \])
diff --git a/sources_non_forked/ale/autoload/ale/fixers/prettier.vim b/sources_non_forked/ale/autoload/ale/fixers/prettier.vim
index 277f84c4..8a67e2ff 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/prettier.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/prettier.vim
@@ -7,7 +7,7 @@ call ale#Set('javascript_prettier_use_global', get(g:, 'ale_use_global_executabl
 call ale#Set('javascript_prettier_options', '')
 
 function! ale#fixers#prettier#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_prettier', [
+    return ale#path#FindExecutable(a:buffer, 'javascript_prettier', [
     \   'node_modules/.bin/prettier_d',
     \   'node_modules/prettier-cli/index.js',
     \   'node_modules/.bin/prettier',
@@ -34,19 +34,11 @@ function! ale#fixers#prettier#ProcessPrettierDOutput(buffer, output) abort
     return a:output
 endfunction
 
-function! ale#fixers#prettier#GetProjectRoot(buffer) abort
+function! ale#fixers#prettier#GetCwd(buffer) abort
     let l:config = ale#path#FindNearestFile(a:buffer, '.prettierignore')
 
-    if !empty(l:config)
-        return fnamemodify(l:config, ':h')
-    endif
-
     " Fall back to the directory of the buffer
-    return fnamemodify(bufname(a:buffer), ':p:h')
-endfunction
-
-function! ale#fixers#prettier#CdProjectRoot(buffer) abort
-    return ale#path#CdString(ale#fixers#prettier#GetProjectRoot(a:buffer))
+    return !empty(l:config) ? fnamemodify(l:config, ':h') : '%s:h'
 endfunction
 
 function! ale#fixers#prettier#ApplyFixForVersion(buffer, version) abort
@@ -82,6 +74,7 @@ function! ale#fixers#prettier#ApplyFixForVersion(buffer, version) abort
         \    'graphql': 'graphql',
         \    'markdown': 'markdown',
         \    'vue': 'vue',
+        \    'svelte': 'svelte',
         \    'yaml': 'yaml',
         \    'openapi': 'yaml',
         \    'html': 'html',
@@ -103,8 +96,8 @@ function! ale#fixers#prettier#ApplyFixForVersion(buffer, version) abort
     " Special error handling needed for prettier_d
     if l:executable =~# 'prettier_d$'
         return {
-        \   'command': ale#path#BufferCdString(a:buffer)
-        \       . ale#Escape(l:executable)
+        \   'cwd': '%s:h',
+        \   'command':ale#Escape(l:executable)
         \       . (!empty(l:options) ? ' ' . l:options : '')
         \       . ' --stdin-filepath %s --stdin',
         \   'process_with': 'ale#fixers#prettier#ProcessPrettierDOutput',
@@ -114,8 +107,8 @@ function! ale#fixers#prettier#ApplyFixForVersion(buffer, version) abort
     " 1.4.0 is the first version with --stdin-filepath
     if ale#semver#GTE(a:version, [1, 4, 0])
         return {
-        \   'command': ale#fixers#prettier#CdProjectRoot(a:buffer)
-        \       . ale#Escape(l:executable)
+        \   'cwd': ale#fixers#prettier#GetCwd(a:buffer),
+        \   'command': ale#Escape(l:executable)
         \       . (!empty(l:options) ? ' ' . l:options : '')
         \       . ' --stdin-filepath %s --stdin',
         \}
diff --git a/sources_non_forked/ale/autoload/ale/fixers/prettier_eslint.vim b/sources_non_forked/ale/autoload/ale/fixers/prettier_eslint.vim
index 1e66f49e..0b9c88b7 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/prettier_eslint.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/prettier_eslint.vim
@@ -7,7 +7,7 @@ call ale#Set('javascript_prettier_eslint_use_global', get(g:, 'ale_use_global_ex
 call ale#Set('javascript_prettier_eslint_options', '')
 
 function! ale#fixers#prettier_eslint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_prettier_eslint', [
+    return ale#path#FindExecutable(a:buffer, 'javascript_prettier_eslint', [
     \   'node_modules/prettier-eslint-cli/dist/index.js',
     \   'node_modules/.bin/prettier-eslint',
     \])
@@ -37,8 +37,8 @@ function! ale#fixers#prettier_eslint#ApplyFixForVersion(buffer, version) abort
     " 4.4.0 is the first version with --stdin-filepath
     if ale#semver#GTE(a:version, [4, 4, 0])
         return {
-        \   'command': ale#path#BufferCdString(a:buffer)
-        \       . ale#Escape(l:executable)
+        \   'cwd': '%s:h',
+        \   'command': ale#Escape(l:executable)
         \       . l:eslint_config_option
         \       . (!empty(l:options) ? ' ' . l:options : '')
         \       . ' --stdin-filepath %s --stdin',
diff --git a/sources_non_forked/ale/autoload/ale/fixers/prettier_standard.vim b/sources_non_forked/ale/autoload/ale/fixers/prettier_standard.vim
index 9d982ff6..c8c09e31 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/prettier_standard.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/prettier_standard.vim
@@ -6,7 +6,7 @@ call ale#Set('javascript_prettier_standard_use_global', get(g:, 'ale_use_global_
 call ale#Set('javascript_prettier_standard_options', '')
 
 function! ale#fixers#prettier_standard#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_prettier_standard', [
+    return ale#path#FindExecutable(a:buffer, 'javascript_prettier_standard', [
     \   'node_modules/prettier-standard/lib/index.js',
     \   'node_modules/.bin/prettier-standard',
     \])
diff --git a/sources_non_forked/ale/autoload/ale/fixers/protolint.vim b/sources_non_forked/ale/autoload/ale/fixers/protolint.vim
new file mode 100644
index 00000000..9b8e72f1
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/protolint.vim
@@ -0,0 +1,26 @@
+" Author: Yohei Yoshimuta <yoheimuta@gmail.com>
+" Description: Integration of protolint with ALE.
+
+call ale#Set('proto_protolint_executable', 'protolint')
+call ale#Set('proto_protolint_config', '')
+
+function! ale#fixers#protolint#GetExecutable(buffer) abort
+    let l:executable = ale#Var(a:buffer, 'proto_protolint_executable')
+
+    return ale#Escape(l:executable)
+endfunction
+
+function! ale#fixers#protolint#Fix(buffer) abort
+    let l:executable = ale#fixers#protolint#GetExecutable(a:buffer)
+    let l:config = ale#Var(a:buffer, 'proto_protolint_config')
+
+    return {
+    \   'command': l:executable
+    \       . (!empty(l:config) ? ' -config_path=' . ale#Escape(l:config) : '')
+    \       . ' -fix'
+    \       . ' %t',
+    \   'read_temporary_file': 1,
+    \}
+endfunction
+
+
diff --git a/sources_non_forked/ale/autoload/ale/fixers/ptop.vim b/sources_non_forked/ale/autoload/ale/fixers/ptop.vim
new file mode 100644
index 00000000..98345226
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/ptop.vim
@@ -0,0 +1,17 @@
+" Author: BarrOff https://github.com/BarrOff
+" Description: Integration of ptop with ALE.
+
+call ale#Set('pascal_ptop_executable', 'ptop')
+call ale#Set('pascal_ptop_options', '')
+
+function! ale#fixers#ptop#Fix(buffer) abort
+    let l:executable = ale#Var(a:buffer, 'pascal_ptop_executable')
+    let l:options = ale#Var(a:buffer, 'pascal_ptop_options')
+
+    return {
+    \   'command': ale#Escape(l:executable)
+    \       . (empty(l:options) ? '' : ' ' . l:options)
+    \       . ' %s %t',
+    \   'read_temporary_file': 1,
+    \}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/remark_lint.vim b/sources_non_forked/ale/autoload/ale/fixers/remark_lint.vim
index 3ce442f3..85593b44 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/remark_lint.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/remark_lint.vim
@@ -6,7 +6,7 @@ call ale#Set('markdown_remark_lint_use_global', get(g:, 'ale_use_global_executab
 call ale#Set('markdown_remark_lint_options', '')
 
 function! ale#fixers#remark_lint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'markdown_remark_lint', [
+    return ale#path#FindExecutable(a:buffer, 'markdown_remark_lint', [
     \   'node_modules/remark-cli/cli.js',
     \   'node_modules/.bin/remark',
     \])
diff --git a/sources_non_forked/ale/autoload/ale/fixers/standard.vim b/sources_non_forked/ale/autoload/ale/fixers/standard.vim
index 46decebf..b9d60ebb 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/standard.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/standard.vim
@@ -6,7 +6,7 @@ call ale#Set('javascript_standard_use_global', get(g:, 'ale_use_global_executabl
 call ale#Set('javascript_standard_options', '')
 
 function! ale#fixers#standard#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_standard', [
+    return ale#path#FindExecutable(a:buffer, 'javascript_standard', [
     \   'node_modules/standardx/bin/cmd.js',
     \   'node_modules/standard/bin/cmd.js',
     \   'node_modules/.bin/standard',
diff --git a/sources_non_forked/ale/autoload/ale/fixers/stylelint.vim b/sources_non_forked/ale/autoload/ale/fixers/stylelint.vim
index 6f4cf177..650b9c4a 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/stylelint.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/stylelint.vim
@@ -6,7 +6,7 @@ call ale#Set('stylelint_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('stylelint_options', '')
 
 function! ale#fixers#stylelint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'stylelint', [
+    return ale#path#FindExecutable(a:buffer, 'stylelint', [
     \   'node_modules/stylelint/bin/stylelint.js',
     \   'node_modules/.bin/stylelint',
     \])
@@ -17,11 +17,10 @@ function! ale#fixers#stylelint#Fix(buffer) abort
     let l:options = ale#Var(a:buffer, 'stylelint_options')
 
     return {
-    \   'command': ale#path#BufferCdString(a:buffer)
-    \       . ale#node#Executable(a:buffer, l:executable)
-    \       . ' %t'
+    \   'cwd': '%s:h',
+    \   'command': ale#node#Executable(a:buffer, l:executable)
     \       . ale#Pad(l:options)
-    \       . ' --fix',
-    \   'read_temporary_file': 1,
+    \       . ' --fix --stdin --stdin-filename %s',
+    \   'read_temporary_file': 0,
     \}
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/swiftformat.vim b/sources_non_forked/ale/autoload/ale/fixers/swiftformat.vim
index 304182b2..cc553b7d 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/swiftformat.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/swiftformat.vim
@@ -6,7 +6,7 @@ call ale#Set('swift_swiftformat_use_global', get(g:, 'ale_use_global_executables
 call ale#Set('swift_swiftformat_options', '')
 
 function! ale#fixers#swiftformat#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'swift_swiftformat', [
+    return ale#path#FindExecutable(a:buffer, 'swift_swiftformat', [
     \   'Pods/SwiftFormat/CommandLineTool/swiftformat',
     \   'ios/Pods/SwiftFormat/CommandLineTool/swiftformat',
     \   'swiftformat',
diff --git a/sources_non_forked/ale/autoload/ale/fixers/tidy.vim b/sources_non_forked/ale/autoload/ale/fixers/tidy.vim
index 1af4120b..2c79e73a 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/tidy.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/tidy.vim
@@ -5,7 +5,7 @@ call ale#Set('html_tidy_executable', 'tidy')
 call ale#Set('html_tidy_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale#fixers#tidy#Fix(buffer) abort
-    let l:executable = ale#node#FindExecutable(
+    let l:executable = ale#path#FindExecutable(
     \   a:buffer,
     \   'html_tidy',
     \   ['tidy'],
diff --git a/sources_non_forked/ale/autoload/ale/fixers/vfmt.vim b/sources_non_forked/ale/autoload/ale/fixers/vfmt.vim
new file mode 100644
index 00000000..2e780318
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/fixers/vfmt.vim
@@ -0,0 +1,13 @@
+" Author: fiatjaf <fiatjaf@alhur.es>
+" Description: Integration of `v fmt` with ALE.
+
+call ale#Set('v_vfmt_options', '')
+
+function! ale#fixers#vfmt#Fix(buffer) abort
+    let l:executable = ale#Var(a:buffer, 'v_v_executable')
+    let l:options = ale#Var(a:buffer, 'v_vfmt_options')
+
+    return {
+    \   'command': ale#Escape(l:executable) . ' fmt' . ale#Pad(l:options)
+    \}
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/fixers/yamlfix.vim b/sources_non_forked/ale/autoload/ale/fixers/yamlfix.vim
index 966556c9..6654a25c 100755
--- a/sources_non_forked/ale/autoload/ale/fixers/yamlfix.vim
+++ b/sources_non_forked/ale/autoload/ale/fixers/yamlfix.vim
@@ -7,7 +7,6 @@ call ale#Set('yaml_yamlfix_use_global', get(g:, 'ale_use_global_executables', 0)
 
 function! ale#fixers#yamlfix#Fix(buffer) abort
     let l:options = ale#Var(a:buffer, 'yaml_yamlfix_options')
-
     let l:executable = ale#python#FindExecutable(
     \   a:buffer,
     \   'yaml_yamlfix',
@@ -19,7 +18,8 @@ function! ale#fixers#yamlfix#Fix(buffer) abort
     endif
 
     return {
-    \   'command': ale#path#BufferCdString(a:buffer)
-    \   .   ale#Escape(l:executable) . (!empty(l:options) ? ' ' . l:options : '') . ' -',
+    \   'cwd': '%s:h',
+    \   'command': ale#Escape(l:executable)
+    \       . (!empty(l:options) ? ' ' . l:options : '') . ' -',
     \}
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/floating_preview.vim b/sources_non_forked/ale/autoload/ale/floating_preview.vim
index e6a75689..163ae2e2 100755
--- a/sources_non_forked/ale/autoload/ale/floating_preview.vim
+++ b/sources_non_forked/ale/autoload/ale/floating_preview.vim
@@ -47,16 +47,65 @@ function! ale#floating_preview#Show(lines, ...) abort
         endif
     augroup END
 
+<<<<<<< HEAD
     let l:width = max(map(copy(a:lines), 'strdisplaywidth(v:val)'))
     let l:height = min([len(a:lines), 10])
     call nvim_win_set_width(w:preview['id'], l:width)
     call nvim_win_set_height(w:preview['id'], l:height)
 
     call nvim_buf_set_lines(w:preview['buffer'], 0, -1, v:false, a:lines)
+=======
+    let [l:lines, l:width, l:height] = s:PrepareWindowContent(a:lines)
+
+    call nvim_win_set_width(w:preview['id'], l:width)
+    call nvim_win_set_height(w:preview['id'], l:height)
+    call nvim_buf_set_lines(w:preview['buffer'], 0, -1, v:false, l:lines)
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     call nvim_buf_set_option(w:preview['buffer'], 'modified', v:false)
     call nvim_buf_set_option(w:preview['buffer'], 'modifiable', v:false)
 endfunction
 
+<<<<<<< HEAD
+=======
+function! s:PrepareWindowContent(lines) abort
+    let l:max_height = 10
+
+    let l:width = max(map(copy(a:lines), 'strdisplaywidth(v:val)'))
+    let l:height = min([len(a:lines), l:max_height])
+
+    if empty(g:ale_floating_window_border)
+        return [a:lines, l:width, l:height]
+    endif
+
+    " Add the size of borders
+    let l:width += 2
+    let l:height += 2
+
+    let l:hor          = g:ale_floating_window_border[0]
+    let l:top          = g:ale_floating_window_border[1]
+    let l:top_left     = g:ale_floating_window_border[2]
+    let l:top_right    = g:ale_floating_window_border[3]
+    let l:bottom_right = g:ale_floating_window_border[4]
+    let l:bottom_left  = g:ale_floating_window_border[5]
+
+    let l:lines = [l:top_left . repeat(l:top, l:width - 2) . l:top_right]
+
+    for l:line in a:lines
+        let l:line_width = strchars(l:line)
+        let l:lines = add(l:lines, l:hor . l:line . repeat(' ', l:width - l:line_width - 2). l:hor)
+    endfor
+
+    " Truncate the lines
+    if len(l:lines) > l:max_height + 1
+        let l:lines = l:lines[0:l:max_height]
+    endif
+
+    let l:lines = add(l:lines, l:bottom_left . repeat(l:top, l:width - 2) . l:bottom_right)
+
+    return [l:lines, l:width, l:height]
+endfunction
+
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 function! s:Create(options) abort
     let l:buffer = nvim_create_buf(v:false, v:false)
     let l:winid = nvim_open_win(l:buffer, v:false, {
@@ -76,6 +125,12 @@ function! s:Create(options) abort
 endfunction
 
 function! s:Close() abort
+<<<<<<< HEAD
+=======
+    let l:mode = mode()
+    let l:restore_visual = l:mode is# 'v' || l:mode is# 'V' || l:mode is# "\<C-V>"
+
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     if !exists('w:preview')
         return
     endif
@@ -87,5 +142,13 @@ function! s:Close() abort
     endif
 
     unlet w:preview
+<<<<<<< HEAD
 endfunction
 
+=======
+
+    if l:restore_visual
+        normal! gv
+    endif
+endfunction
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
diff --git a/sources_non_forked/ale/autoload/ale/go.vim b/sources_non_forked/ale/autoload/ale/go.vim
index 4a21e596..bce85a87 100755
--- a/sources_non_forked/ale/autoload/ale/go.vim
+++ b/sources_non_forked/ale/autoload/ale/go.vim
@@ -42,3 +42,17 @@ function! ale#go#EnvString(buffer) abort
 
     return l:env
 endfunction
+
+function! ale#go#GetGoPathExecutable(suffix) abort
+    let l:prefix = $GOPATH
+
+    if !empty($GOPATH)
+        let l:prefix = $GOPATH
+    elseif has('win32')
+        let l:prefix = $USERPROFILE . '/go'
+    else
+        let l:prefix = $HOME . '/go'
+    endif
+
+    return ale#path#Simplify(l:prefix . '/' . a:suffix)
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/gradle.vim b/sources_non_forked/ale/autoload/ale/gradle.vim
index dc377fb9..ba1add4d 100755
--- a/sources_non_forked/ale/autoload/ale/gradle.vim
+++ b/sources_non_forked/ale/autoload/ale/gradle.vim
@@ -50,18 +50,25 @@ function! ale#gradle#FindExecutable(buffer) abort
     return ''
 endfunction
 
-" Given a buffer number, build a command to print the classpath of the root
-" project. Returns an empty string if cannot build the command.
+" Given a buffer number, get a working directory and command to print the
+" classpath of the root project.
+"
+" Returns an empty string for the command if Gradle is not detected.
 function! ale#gradle#BuildClasspathCommand(buffer) abort
     let l:executable = ale#gradle#FindExecutable(a:buffer)
-    let l:project_root = ale#gradle#FindProjectRoot(a:buffer)
 
-    if !empty(l:executable) && !empty(l:project_root)
-        return ale#path#CdString(l:project_root)
-        \   . ale#Escape(l:executable)
-        \   . ' -I ' . ale#Escape(s:init_path)
-        \   . ' -q printClasspath'
+    if !empty(l:executable)
+        let l:project_root = ale#gradle#FindProjectRoot(a:buffer)
+
+        if !empty(l:project_root)
+            return [
+            \   l:project_root,
+            \   ale#Escape(l:executable)
+            \   . ' -I ' . ale#Escape(s:init_path)
+            \   . ' -q printClasspath'
+            \]
+        endif
     endif
 
-    return ''
+    return ['', '']
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/handlers/alex.vim b/sources_non_forked/ale/autoload/ale/handlers/alex.vim
index 190a7f86..6ef4867f 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/alex.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/alex.vim
@@ -3,7 +3,7 @@ scriptencoding utf-8
 " Description: Error handling for errors in alex output format
 
 function! ale#handlers#alex#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'alex', [
+    return ale#path#FindExecutable(a:buffer, 'alex', [
     \   'node_modules/.bin/alex',
     \   'node_modules/alex/cli.js',
     \])
diff --git a/sources_non_forked/ale/autoload/ale/handlers/cppcheck.vim b/sources_non_forked/ale/autoload/ale/handlers/cppcheck.vim
index 7f68ba67..b70ae1bf 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/cppcheck.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/cppcheck.vim
@@ -1,10 +1,9 @@
 " Description: Handle errors for cppcheck.
 
-function! ale#handlers#cppcheck#GetCdCommand(buffer) abort
+function! ale#handlers#cppcheck#GetCwd(buffer) abort
     let [l:dir, l:json_path] = ale#c#FindCompileCommands(a:buffer)
-    let l:cd_command = !empty(l:dir) ? ale#path#CdString(l:dir) : ''
 
-    return l:cd_command
+    return !empty(l:dir) ? l:dir : ''
 endfunction
 
 function! ale#handlers#cppcheck#GetBufferPathIncludeOptions(buffer) abort
diff --git a/sources_non_forked/ale/autoload/ale/handlers/eslint.vim b/sources_non_forked/ale/autoload/ale/handlers/eslint.vim
index b8610612..374460bc 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/eslint.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/eslint.vim
@@ -2,10 +2,10 @@
 " Description: Functions for working with eslint, for checking or fixing files.
 
 let s:executables = [
+\   '.yarn/sdks/eslint/bin/eslint.js',
 \   'node_modules/.bin/eslint_d',
 \   'node_modules/eslint/bin/eslint.js',
 \   'node_modules/.bin/eslint',
-\   '.yarn/sdks/eslint/bin/eslint',
 \]
 let s:sep = has('win32') ? '\' : '/'
 
@@ -36,12 +36,11 @@ function! ale#handlers#eslint#FindConfig(buffer) abort
 endfunction
 
 function! ale#handlers#eslint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_eslint', s:executables)
+    return ale#path#FindExecutable(a:buffer, 'javascript_eslint', s:executables)
 endfunction
 
-" Given a buffer, return a command prefix string which changes directory
-" as necessary for running ESLint.
-function! ale#handlers#eslint#GetCdString(buffer) abort
+" Given a buffer, return an appropriate working directory for ESLint.
+function! ale#handlers#eslint#GetCwd(buffer) abort
     " ESLint 6 loads plugins/configs/parsers from the project root
     " By default, the project root is simply the CWD of the running process.
     " https://github.com/eslint/rfcs/blob/master/designs/2018-simplified-package-loading/README.md
@@ -50,17 +49,23 @@ function! ale#handlers#eslint#GetCdString(buffer) abort
     " If eslint is installed in a directory which contains the buffer, assume
     " it is the ESLint project root.  Otherwise, use nearest node_modules.
     " Note: If node_modules not present yet, can't load local deps anyway.
-    let l:executable = ale#node#FindNearestExecutable(a:buffer, s:executables)
+    let l:executable = ale#path#FindNearestExecutable(a:buffer, s:executables)
 
     if !empty(l:executable)
-        let l:nmi = strridx(l:executable, 'node_modules')
-        let l:project_dir = l:executable[0:l:nmi - 2]
+        let l:modules_index = strridx(l:executable, 'node_modules')
+        let l:modules_root = l:modules_index > -1 ? l:executable[0:l:modules_index - 2] : ''
+
+        let l:sdks_index = strridx(l:executable, ale#path#Simplify('.yarn/sdks'))
+        let l:sdks_root = l:sdks_index > -1 ? l:executable[0:l:sdks_index - 2] : ''
     else
         let l:modules_dir = ale#path#FindNearestDirectory(a:buffer, 'node_modules')
-        let l:project_dir = !empty(l:modules_dir) ? fnamemodify(l:modules_dir, ':h:h') : ''
+        let l:modules_root = !empty(l:modules_dir) ? fnamemodify(l:modules_dir, ':h:h') : ''
+
+        let l:sdks_dir = ale#path#FindNearestDirectory(a:buffer, ale#path#Simplify('.yarn/sdks'))
+        let l:sdks_root = !empty(l:sdks_dir) ? fnamemodify(l:sdks_dir, ':h:h:h') : ''
     endif
 
-    return !empty(l:project_dir) ? ale#path#CdString(l:project_dir) : ''
+    return strlen(l:modules_root) > strlen(l:sdks_root) ? l:modules_root : l:sdks_root
 endfunction
 
 function! ale#handlers#eslint#GetCommand(buffer) abort
@@ -68,8 +73,7 @@ function! ale#handlers#eslint#GetCommand(buffer) abort
 
     let l:options = ale#Var(a:buffer, 'javascript_eslint_options')
 
-    return ale#handlers#eslint#GetCdString(a:buffer)
-    \   . ale#node#Executable(a:buffer, l:executable)
+    return ale#node#Executable(a:buffer, l:executable)
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . ' -f json --stdin --stdin-filename %s'
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/handlers/fecs.vim b/sources_non_forked/ale/autoload/ale/handlers/fecs.vim
index 5362edb9..064b927e 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/fecs.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/fecs.vim
@@ -9,7 +9,7 @@ function! ale#handlers#fecs#GetCommand(buffer) abort
 endfunction
 
 function! ale#handlers#fecs#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_fecs', [
+    return ale#path#FindExecutable(a:buffer, 'javascript_fecs', [
     \   'node_modules/.bin/fecs',
     \   'node_modules/fecs/bin/fecs',
     \])
diff --git a/sources_non_forked/ale/autoload/ale/handlers/ocamllsp.vim b/sources_non_forked/ale/autoload/ale/handlers/ocamllsp.vim
index 07d9b0cf..638b67ef 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/ocamllsp.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/ocamllsp.vim
@@ -1,6 +1,16 @@
 " Author: Risto Stevcev <me@risto.codes>
 " Description: Handlers for the official OCaml language server
 
+<<<<<<< HEAD
+=======
+let s:language_id_of_filetype = {
+\  'menhir': 'ocaml.menhir',
+\  'ocaml': 'ocaml',
+\  'ocamlinterface': 'ocaml.interface',
+\  'ocamllex': 'ocaml.lex'
+\}
+
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 function! ale#handlers#ocamllsp#GetExecutable(buffer) abort
     return 'ocamllsp'
 endfunction
@@ -13,7 +23,11 @@ function! ale#handlers#ocamllsp#GetCommand(buffer) abort
 endfunction
 
 function! ale#handlers#ocamllsp#GetLanguage(buffer) abort
+<<<<<<< HEAD
     return getbufvar(a:buffer, '&filetype')
+=======
+    return s:language_id_of_filetype[getbufvar(a:buffer, '&filetype')]
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 endfunction
 
 function! ale#handlers#ocamllsp#GetProjectRoot(buffer) abort
diff --git a/sources_non_forked/ale/autoload/ale/handlers/ols.vim b/sources_non_forked/ale/autoload/ale/handlers/ols.vim
index 74130a26..c292c6d9 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/ols.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/ols.vim
@@ -4,7 +4,7 @@
 function! ale#handlers#ols#GetExecutable(buffer) abort
     let l:ols_setting = ale#handlers#ols#GetLanguage(a:buffer) . '_ols'
 
-    return ale#node#FindExecutable(a:buffer, l:ols_setting, [
+    return ale#path#FindExecutable(a:buffer, l:ols_setting, [
     \   'node_modules/.bin/ocaml-language-server',
     \])
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/handlers/shellcheck.vim b/sources_non_forked/ale/autoload/ale/handlers/shellcheck.vim
index 701c43b2..17de2912 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/shellcheck.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/shellcheck.vim
@@ -40,21 +40,21 @@ function! ale#handlers#shellcheck#GetDialectArgument(buffer) abort
     return ''
 endfunction
 
+function! ale#handlers#shellcheck#GetCwd(buffer) abort
+    return ale#Var(a:buffer, 'sh_shellcheck_change_directory') ? '%s:h' : ''
+endfunction
+
 function! ale#handlers#shellcheck#GetCommand(buffer, version) abort
     let l:options = ale#Var(a:buffer, 'sh_shellcheck_options')
     let l:exclude_option = ale#Var(a:buffer, 'sh_shellcheck_exclusions')
     let l:dialect = ale#Var(a:buffer, 'sh_shellcheck_dialect')
     let l:external_option = ale#semver#GTE(a:version, [0, 4, 0]) ? ' -x' : ''
-    let l:cd_string = ale#Var(a:buffer, 'sh_shellcheck_change_directory')
-    \   ? ale#path#BufferCdString(a:buffer)
-    \   : ''
 
     if l:dialect is# 'auto'
         let l:dialect = ale#handlers#shellcheck#GetDialectArgument(a:buffer)
     endif
 
-    return l:cd_string
-    \   . '%e'
+    return '%e'
     \   . (!empty(l:dialect) ? ' -s ' . l:dialect : '')
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . (!empty(l:exclude_option) ? ' -e ' . l:exclude_option : '')
@@ -111,6 +111,7 @@ function! ale#handlers#shellcheck#DefineLinter(filetype) abort
     call ale#linter#Define(a:filetype, {
     \   'name': 'shellcheck',
     \   'executable': {buffer -> ale#Var(buffer, 'sh_shellcheck_executable')},
+    \   'cwd': function('ale#handlers#shellcheck#GetCwd'),
     \   'command': {buffer -> ale#semver#RunWithVersionCheck(
     \       buffer,
     \       ale#Var(buffer, 'sh_shellcheck_executable'),
diff --git a/sources_non_forked/ale/autoload/ale/handlers/solhint.vim b/sources_non_forked/ale/autoload/ale/handlers/solhint.vim
new file mode 100644
index 00000000..611aa7bd
--- /dev/null
+++ b/sources_non_forked/ale/autoload/ale/handlers/solhint.vim
@@ -0,0 +1,98 @@
+" Author: Henrique Barcelos <@hbarcelos>
+" Description: Functions for working with local solhint for checking *.sol files.
+
+let s:executables = [
+\   'node_modules/.bin/solhint',
+\   'node_modules/solhint/solhint.js',
+\   'solhint',
+\]
+
+let s:sep = has('win32') ? '\' : '/'
+
+call ale#Set('solidity_solhint_options', '')
+call ale#Set('solidity_solhint_executable', 'solhint')
+call ale#Set('solidity_solhint_use_global', get(g:, 'ale_use_global_executables', 0))
+
+function! ale#handlers#solhint#Handle(buffer, lines) abort
+    " Matches patterns like the following:
+    " /path/to/file/file.sol: line 1, col 10, Error - 'addOne' is defined but never used. (no-unused-vars)
+    let l:output = []
+
+    let l:lint_pattern = '\v^[^:]+: line (\d+), col (\d+), (Error|Warning) - (.*) \((.*)\)$'
+
+    for l:match in ale#util#GetMatches(a:lines, l:lint_pattern)
+        let l:isError = l:match[3] is? 'error'
+        call add(l:output, {
+        \   'lnum': l:match[1] + 0,
+        \   'col': l:match[2] + 0,
+        \   'text': l:match[4],
+        \   'code': l:match[5],
+        \   'type': l:isError ? 'E' : 'W',
+        \})
+    endfor
+
+    let l:syntax_pattern = '\v^[^:]+: line (\d+), col (\d+), (Error|Warning) - (Parse error): (.*)$'
+
+    for l:match in ale#util#GetMatches(a:lines, l:syntax_pattern)
+        let l:isError = l:match[3] is? 'error'
+        call add(l:output, {
+        \   'lnum': l:match[1] + 0,
+        \   'col': l:match[2] + 0,
+        \   'text': l:match[5],
+        \   'code': l:match[4],
+        \   'type': l:isError ? 'E' : 'W',
+        \})
+    endfor
+
+    return l:output
+endfunction
+
+function! ale#handlers#solhint#FindConfig(buffer) abort
+    for l:path in ale#path#Upwards(expand('#' . a:buffer . ':p:h'))
+        for l:basename in [
+        \   '.solhintrc.js',
+        \   '.solhintrc.json',
+        \   '.solhintrc',
+        \]
+            let l:config = ale#path#Simplify(join([l:path, l:basename], s:sep))
+
+            if filereadable(l:config)
+                return l:config
+            endif
+        endfor
+    endfor
+
+    return ale#path#FindNearestFile(a:buffer, 'package.json')
+endfunction
+
+function! ale#handlers#solhint#GetExecutable(buffer) abort
+    return ale#path#FindExecutable(a:buffer, 'solidity_solhint', s:executables)
+endfunction
+
+" Given a buffer, return an appropriate working directory for solhint.
+function! ale#handlers#solhint#GetCwd(buffer) abort
+    " If solhint is installed in a directory which contains the buffer, assume
+    " it is the solhint project root. Otherwise, use nearest node_modules.
+    " Note: If node_modules not present yet, can't load local deps anyway.
+    let l:executable = ale#path#FindNearestExecutable(a:buffer, s:executables)
+
+    if !empty(l:executable)
+        let l:nmi = strridx(l:executable, 'node_modules')
+        let l:project_dir = l:executable[0:l:nmi - 2]
+    else
+        let l:modules_dir = ale#path#FindNearestDirectory(a:buffer, 'node_modules')
+        let l:project_dir = !empty(l:modules_dir) ? fnamemodify(l:modules_dir, ':h:h') : ''
+    endif
+
+    return !empty(l:project_dir) ? l:project_dir : ''
+endfunction
+
+function! ale#handlers#solhint#GetCommand(buffer) abort
+    let l:executable = ale#handlers#solhint#GetExecutable(a:buffer)
+
+    let l:options = ale#Var(a:buffer, 'solidity_solhint_options')
+
+    return ale#node#Executable(a:buffer, l:executable)
+    \   . (!empty(l:options) ? ' ' . l:options : '')
+    \   . ' --formatter compact %s'
+endfunction
diff --git a/sources_non_forked/ale/autoload/ale/handlers/textlint.vim b/sources_non_forked/ale/autoload/ale/handlers/textlint.vim
index 6d495b0d..7a648617 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/textlint.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/textlint.vim
@@ -6,7 +6,7 @@ call ale#Set('textlint_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('textlint_options', '')
 
 function! ale#handlers#textlint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'textlint', [
+    return ale#path#FindExecutable(a:buffer, 'textlint', [
     \   'node_modules/.bin/textlint',
     \   'node_modules/textlint/bin/textlint.js',
     \])
diff --git a/sources_non_forked/ale/autoload/ale/handlers/tslint.vim b/sources_non_forked/ale/autoload/ale/handlers/tslint.vim
index 90579344..ee091d24 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/tslint.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/tslint.vim
@@ -7,7 +7,7 @@ function! ale#handlers#tslint#InitVariables() abort
 endfunction
 
 function! ale#handlers#tslint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'typescript_tslint', [
+    return ale#path#FindExecutable(a:buffer, 'typescript_tslint', [
     \   'node_modules/.bin/tslint',
     \])
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/handlers/writegood.vim b/sources_non_forked/ale/autoload/ale/handlers/writegood.vim
index 8ae61a38..b5b91b3f 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/writegood.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/writegood.vim
@@ -11,7 +11,7 @@ endfunction
 call ale#handlers#writegood#ResetOptions()
 
 function! ale#handlers#writegood#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'writegood', [
+    return ale#path#FindExecutable(a:buffer, 'writegood', [
     \   'node_modules/.bin/write-good',
     \   'node_modules/write-good/bin/write-good.js',
     \])
diff --git a/sources_non_forked/ale/autoload/ale/handlers/xo.vim b/sources_non_forked/ale/autoload/ale/handlers/xo.vim
index c63278c0..8d7fae71 100755
--- a/sources_non_forked/ale/autoload/ale/handlers/xo.vim
+++ b/sources_non_forked/ale/autoload/ale/handlers/xo.vim
@@ -9,7 +9,11 @@ call ale#Set('typescript_xo_options', '')
 function! ale#handlers#xo#GetExecutable(buffer) abort
     let l:type = ale#handlers#xo#GetType(a:buffer)
 
+<<<<<<< HEAD
     return ale#node#FindExecutable(a:buffer, l:type . '_xo', [
+=======
+    return ale#path#FindExecutable(a:buffer, l:type . '_xo', [
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     \   'node_modules/xo/cli.js',
     \   'node_modules/.bin/xo',
     \])
diff --git a/sources_non_forked/ale/autoload/ale/linter.vim b/sources_non_forked/ale/autoload/ale/linter.vim
index f9ec48d7..cbc79064 100755
--- a/sources_non_forked/ale/autoload/ale/linter.vim
+++ b/sources_non_forked/ale/autoload/ale/linter.vim
@@ -41,7 +41,7 @@ let s:default_ale_linters = {
 \   'apkbuild': ['apkbuild_lint', 'secfixes_check'],
 \   'csh': ['shell'],
 \   'elixir': ['credo', 'dialyxir', 'dogma'],
-\   'go': ['gofmt', 'golint', 'go vet'],
+\   'go': ['gofmt', 'golint', 'gopls', 'govet'],
 \   'hack': ['hack'],
 \   'help': [],
 \   'inko': ['inko'],
@@ -53,6 +53,7 @@ let s:default_ale_linters = {
 \   'text': [],
 \   'vue': ['eslint', 'vls'],
 \   'zsh': ['shell'],
+\   'v': ['v'],
 \}
 
 " Testing/debugging helper to unload all linters.
@@ -151,17 +152,30 @@ function! ale#linter#PreProcess(filetype, linter) abort
         endif
 
         let l:obj.address = a:linter.address
+
+        if has_key(a:linter, 'cwd')
+            throw '`cwd` makes no sense for socket LSP connections'
+        endif
     else
         throw '`address` must be defined for getting the LSP address'
     endif
 
+    if has_key(a:linter, 'cwd')
+        let l:obj.cwd = a:linter.cwd
+
+        if type(l:obj.cwd) isnot v:t_string
+        \&& type(l:obj.cwd) isnot v:t_func
+            throw '`cwd` must be a String or Function if defined'
+        endif
+    endif
+
     if l:needs_lsp_details
         " Default to using the filetype as the language.
         let l:obj.language = get(a:linter, 'language', a:filetype)
 
         if type(l:obj.language) isnot v:t_string
         \&& type(l:obj.language) isnot v:t_func
-            throw '`language` must be a String or Funcref if defined'
+            throw '`language` must be a String or Function if defined'
         endif
 
         if has_key(a:linter, 'project_root')
@@ -415,6 +429,12 @@ function! ale#linter#GetExecutable(buffer, linter) abort
     \   : l:Executable
 endfunction
 
+function! ale#linter#GetCwd(buffer, linter) abort
+    let l:Cwd = get(a:linter, 'cwd', v:null)
+
+    return type(l:Cwd) is v:t_func ? l:Cwd(a:buffer) : l:Cwd
+endfunction
+
 " Given a buffer and linter, get the command String for the linter.
 function! ale#linter#GetCommand(buffer, linter) abort
     let l:Command = a:linter.command
diff --git a/sources_non_forked/ale/autoload/ale/lsp.vim b/sources_non_forked/ale/autoload/ale/lsp.vim
index cb0573aa..1f854bc5 100755
--- a/sources_non_forked/ale/autoload/ale/lsp.vim
+++ b/sources_non_forked/ale/autoload/ale/lsp.vim
@@ -357,6 +357,7 @@ function! ale#lsp#MarkConnectionAsTsserver(conn_id) abort
     let l:conn.capabilities.completion = 1
     let l:conn.capabilities.completion_trigger_characters = ['.']
     let l:conn.capabilities.definition = 1
+    let l:conn.capabilities.typeDefinition = 1
     let l:conn.capabilities.symbol_search = 1
     let l:conn.capabilities.rename = 1
     let l:conn.capabilities.code_actions = 1
diff --git a/sources_non_forked/ale/autoload/ale/lsp/tsserver_message.vim b/sources_non_forked/ale/autoload/ale/lsp/tsserver_message.vim
index 3c1b47ed..00213a75 100755
--- a/sources_non_forked/ale/autoload/ale/lsp/tsserver_message.vim
+++ b/sources_non_forked/ale/autoload/ale/lsp/tsserver_message.vim
@@ -64,6 +64,14 @@ function! ale#lsp#tsserver_message#Definition(buffer, line, column) abort
     \}]
 endfunction
 
+function! ale#lsp#tsserver_message#TypeDefinition(buffer, line, column) abort
+    return [0, 'ts@typeDefinition', {
+    \   'line': a:line,
+    \   'offset': a:column,
+    \   'file': expand('#' . a:buffer . ':p'),
+    \}]
+endfunction
+
 function! ale#lsp#tsserver_message#References(buffer, line, column) abort
     return [0, 'ts@references', {
     \   'line': a:line,
diff --git a/sources_non_forked/ale/autoload/ale/lsp_linter.vim b/sources_non_forked/ale/autoload/ale/lsp_linter.vim
index 628dde78..b8885f31 100755
--- a/sources_non_forked/ale/autoload/ale/lsp_linter.vim
+++ b/sources_non_forked/ale/autoload/ale/lsp_linter.vim
@@ -201,7 +201,11 @@ function! ale#lsp_linter#GetConfig(buffer, linter) abort
 endfunction
 
 function! ale#lsp_linter#FindProjectRoot(buffer, linter) abort
-    let l:buffer_ale_root = getbufvar(a:buffer, 'ale_lsp_root', {})
+    let l:buffer_ale_root = getbufvar(
+    \   a:buffer,
+    \   'ale_root',
+    \   getbufvar(a:buffer, 'ale_lsp_root', {})
+    \)
 
     if type(l:buffer_ale_root) is v:t_string
         return l:buffer_ale_root
@@ -218,9 +222,15 @@ function! ale#lsp_linter#FindProjectRoot(buffer, linter) abort
         endif
     endif
 
+    let l:global_root = g:ale_root
+
+    if empty(g:ale_root) && exists('g:ale_lsp_root')
+        let l:global_root = g:ale_lsp_root
+    endif
+
     " Try to get a global setting for the root
-    if has_key(g:ale_lsp_root, a:linter.name)
-        let l:Root = g:ale_lsp_root[a:linter.name]
+    if has_key(l:global_root, a:linter.name)
+        let l:Root = l:global_root[a:linter.name]
 
         if type(l:Root) is v:t_func
             return l:Root(a:buffer)
@@ -284,13 +294,15 @@ function! s:StartLSP(options, address, executable, command) abort
             call ale#lsp#MarkConnectionAsTsserver(l:conn_id)
         endif
 
+        let l:cwd = ale#linter#GetCwd(l:buffer, l:linter)
         let l:command = ale#command#FormatCommand(
         \   l:buffer,
         \   a:executable,
         \   a:command,
         \   0,
         \   v:false,
-        \   [],
+        \   l:cwd,
+        \   ale#GetFilenameMappings(l:buffer, l:linter.name),
         \)[1]
         let l:command = ale#job#PrepareCommand(l:buffer, l:command)
         let l:ready = ale#lsp#StartProgram(l:conn_id, a:executable, l:command)
diff --git a/sources_non_forked/ale/autoload/ale/maven.vim b/sources_non_forked/ale/autoload/ale/maven.vim
index 42735286..4f87ebb7 100755
--- a/sources_non_forked/ale/autoload/ale/maven.vim
+++ b/sources_non_forked/ale/autoload/ale/maven.vim
@@ -17,7 +17,6 @@ function! ale#maven#FindProjectRoot(buffer) abort
     return ''
 endfunction
 
-
 " Given a buffer number, find the path to the executable.
 " First search on the path for 'mvnw' (mvnw.cmd on Windows), if nothing is found,
 " try the global command. Returns an empty string if cannot find the executable.
@@ -36,16 +35,23 @@ function! ale#maven#FindExecutable(buffer) abort
     return ''
 endfunction
 
-" Given a buffer number, build a command to print the classpath of the root
-" project. Returns an empty string if cannot build the command.
+" Given a buffer number, get a working directory and command to print the
+" classpath of the root project.
+"
+" Returns an empty string for the command if Maven is not detected.
 function! ale#maven#BuildClasspathCommand(buffer) abort
     let l:executable = ale#maven#FindExecutable(a:buffer)
-    let l:project_root = ale#maven#FindProjectRoot(a:buffer)
 
-    if !empty(l:executable) && !empty(l:project_root)
-        return ale#path#CdString(l:project_root)
-        \ . l:executable . ' dependency:build-classpath'
+    if !empty(l:executable)
+        let l:project_root = ale#maven#FindProjectRoot(a:buffer)
+
+        if !empty(l:project_root)
+            return [
+            \   l:project_root,
+            \   ale#Escape(l:executable) . ' dependency:build-classpath'
+            \]
+        endif
     endif
 
-    return ''
+    return ['', '']
 endfunction
diff --git a/sources_non_forked/ale/autoload/ale/node.vim b/sources_non_forked/ale/autoload/ale/node.vim
index 9b9b335a..9e11ca7e 100755
--- a/sources_non_forked/ale/autoload/ale/node.vim
+++ b/sources_non_forked/ale/autoload/ale/node.vim
@@ -3,38 +3,6 @@
 
 call ale#Set('windows_node_executable_path', 'node.exe')
 
-" Given a buffer number, a base variable name, and a list of paths to search
-" for in ancestor directories, detect the executable path for a Node program.
-"
-" The use_global and executable options for the relevant program will be used.
-function! ale#node#FindExecutable(buffer, base_var_name, path_list) abort
-    if ale#Var(a:buffer, a:base_var_name . '_use_global')
-        return ale#Var(a:buffer, a:base_var_name . '_executable')
-    endif
-
-    let l:nearest = ale#node#FindNearestExecutable(a:buffer, a:path_list)
-
-    if !empty(l:nearest)
-        return l:nearest
-    endif
-
-    return ale#Var(a:buffer, a:base_var_name . '_executable')
-endfunction
-
-" Given a buffer number, a base variable name, and a list of paths to search
-" for in ancestor directories, detect the executable path for a Node program.
-function! ale#node#FindNearestExecutable(buffer, path_list) abort
-    for l:path in a:path_list
-        let l:executable = ale#path#FindNearestFile(a:buffer, l:path)
-
-        if !empty(l:executable)
-            return l:executable
-        endif
-    endfor
-
-    return ''
-endfunction
-
 " Create a executable string which executes a Node.js script command with a
 " Node.js executable if needed.
 "
diff --git a/sources_non_forked/ale/autoload/ale/path.vim b/sources_non_forked/ale/autoload/ale/path.vim
index fed95ccd..c7bfd47e 100755
--- a/sources_non_forked/ale/autoload/ale/path.vim
+++ b/sources_non_forked/ale/autoload/ale/path.vim
@@ -77,24 +77,40 @@ function! ale#path#ResolveLocalPath(buffer, search_string, global_fallback) abor
     return l:path
 endfunction
 
-" Output 'cd <directory> && '
-" This function can be used changing the directory for a linter command.
-function! ale#path#CdString(directory) abort
-    if has('win32')
-        return 'cd /d ' . ale#Escape(a:directory) . ' && '
-    endif
+" Given a buffer number, a base variable name, and a list of paths to search
+" for in ancestor directories, detect the executable path for a program.
+function! ale#path#FindNearestExecutable(buffer, path_list) abort
+    for l:path in a:path_list
+        if ale#path#IsAbsolute(l:path)
+            let l:executable = filereadable(l:path) ? l:path : ''
+        else
+            let l:executable = ale#path#FindNearestFile(a:buffer, l:path)
+        endif
 
-    return 'cd ' . ale#Escape(a:directory) . ' && '
+        if !empty(l:executable)
+            return l:executable
+        endif
+    endfor
+
+    return ''
 endfunction
 
-" Output 'cd <buffer_filename_directory> && '
-" This function can be used changing the directory for a linter command.
-function! ale#path#BufferCdString(buffer) abort
-    if has('win32')
-        return 'cd /d %s:h && '
+" Given a buffer number, a base variable name, and a list of paths to search
+" for in ancestor directories, detect the executable path for a program.
+"
+" The use_global and executable options for the relevant program will be used.
+function! ale#path#FindExecutable(buffer, base_var_name, path_list) abort
+    if ale#Var(a:buffer, a:base_var_name . '_use_global')
+        return ale#Var(a:buffer, a:base_var_name . '_executable')
     endif
 
-    return 'cd %s:h && '
+    let l:nearest = ale#path#FindNearestExecutable(a:buffer, a:path_list)
+
+    if !empty(l:nearest)
+        return l:nearest
+    endif
+
+    return ale#Var(a:buffer, a:base_var_name . '_executable')
 endfunction
 
 " Return 1 if a path is an absolute path.
@@ -136,7 +152,7 @@ function! ale#path#Dirname(path) abort
     endif
 
     " For /foo/bar/ we need :h:h to get /foo
-    if a:path[-1:] is# '/'
+    if a:path[-1:] is# '/' || (has('win32') && a:path[-1:] is# '\')
         return fnamemodify(a:path, ':h:h')
     endif
 
diff --git a/sources_non_forked/ale/autoload/ale/sign.vim b/sources_non_forked/ale/autoload/ale/sign.vim
index 2864f39b..7a7cab03 100755
--- a/sources_non_forked/ale/autoload/ale/sign.vim
+++ b/sources_non_forked/ale/autoload/ale/sign.vim
@@ -52,9 +52,13 @@ endif
 function! ale#sign#SetUpDefaultColumnWithoutErrorsHighlight() abort
     let l:verbose = &verbose
     set verbose=0
+<<<<<<< HEAD
     redir => l:output
         0verbose silent highlight SignColumn
     redir end
+=======
+    let l:output = execute('highlight SignColumn', 'silent')
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     let &verbose = l:verbose
 
     let l:highlight_syntax = join(split(l:output)[2:])
@@ -171,10 +175,10 @@ endfunction
 
 " Read sign data for a buffer to a list of lines.
 function! ale#sign#ReadSigns(buffer) abort
-    redir => l:output
-        silent execute 'sign place ' . s:GroupCmd() . s:PriorityCmd()
-        \ . ' buffer=' . a:buffer
-    redir end
+    let l:output = execute(
+    \   'sign place ' . s:GroupCmd() . s:PriorityCmd()
+    \   . ' buffer=' . a:buffer
+    \ )
 
     return split(l:output, "\n")
 endfunction
@@ -203,6 +207,27 @@ function! ale#sign#ParsePattern() abort
     return l:pattern
 endfunction
 
+" Given a buffer number, return a List of placed signs [line, id, group]
+function! ale#sign#ParseSignsWithGetPlaced(buffer) abort
+    let l:signs = sign_getplaced(a:buffer, { 'group': s:supports_sign_groups ? 'ale' : '' })[0].signs
+    let l:result = []
+    let l:is_dummy_sign_set = 0
+
+    for l:sign in l:signs
+        if l:sign['name'] is# 'ALEDummySign'
+            let l:is_dummy_sign_set = 1
+        else
+            call add(l:result, [
+            \   str2nr(l:sign['lnum']),
+            \   str2nr(l:sign['id']),
+            \   l:sign['name'],
+            \])
+        endif
+    endfor
+
+    return [l:is_dummy_sign_set, l:result]
+endfunction
+
 " Given a list of lines for sign output, return a List of [line, id, group]
 function! ale#sign#ParseSigns(line_list) abort
     let l:pattern =ale#sign#ParsePattern()
@@ -229,9 +254,13 @@ function! ale#sign#ParseSigns(line_list) abort
 endfunction
 
 function! ale#sign#FindCurrentSigns(buffer) abort
-    let l:line_list = ale#sign#ReadSigns(a:buffer)
+    if exists('*sign_getplaced')
+        return ale#sign#ParseSignsWithGetPlaced(a:buffer)
+    else
+        let l:line_list = ale#sign#ReadSigns(a:buffer)
 
-    return ale#sign#ParseSigns(l:line_list)
+        return ale#sign#ParseSigns(l:line_list)
+    endif
 endfunction
 
 " Given a loclist, group the List into with one List per line.
diff --git a/sources_non_forked/ale/autoload/ale/swift.vim b/sources_non_forked/ale/autoload/ale/swift.vim
index b31b8dc5..3232d42a 100755
--- a/sources_non_forked/ale/autoload/ale/swift.vim
+++ b/sources_non_forked/ale/autoload/ale/swift.vim
@@ -11,3 +11,60 @@ function! ale#swift#FindProjectRoot(buffer) abort
 
     return ''
 endfunction
+
+" Support Apple Swift Format {{{1
+
+call ale#Set('swift_appleswiftformat_executable', 'swift-format')
+call ale#Set('swift_appleswiftformat_use_swiftpm', 0)
+
+" Return the executable depending on whether or not to use Swift Package Manager.
+"
+" If not asked to use Swift Package Manager (use_swiftpm = 0), the returned
+" value is the global executable, else the returned value is 'swift' because
+" the final command line will be `swift run swift-format ...`.
+"
+" Failure is expected if use_swiftpm is `1` but no Package.swift can be located.
+function! ale#swift#GetAppleSwiftFormatExecutable(buffer) abort
+    if !ale#Var(a:buffer, 'swift_appleswiftformat_use_swiftpm')
+        return ale#Var(a:buffer, 'swift_appleswiftformat_executable')
+    endif
+
+    if ale#path#FindNearestFile(a:buffer, 'Package.swift') is# ''
+        " If there is no Package.swift file, we don't use swift-format even if it exists,
+        " so we return '' to indicate failure.
+        return ''
+    endif
+
+    return 'swift'
+endfunction
+
+" Return the command depending on whether or not to use Swift Package Manager.
+"
+" If asked to use Swift Package Manager (use_swiftpm = 1), the command
+" arguments are prefixed with 'swift run'.
+"
+" In either case, the configuration file is located and added to the command.
+function! ale#swift#GetAppleSwiftFormatCommand(buffer) abort
+    let l:executable = ale#swift#GetAppleSwiftFormatExecutable(a:buffer)
+    let l:command_args = ''
+
+    if ale#Var(a:buffer, 'swift_appleswiftformat_use_swiftpm')
+        let l:command_args = ' ' . 'run swift-format'
+    endif
+
+    return ale#Escape(l:executable) . l:command_args
+endfunction
+
+" Locate the nearest '.swift-format' configuration file, and return the
+" arguments, else return an empty string.
+function! ale#swift#GetAppleSwiftFormatConfigArgs(buffer) abort
+    let l:config_filepath = ale#path#FindNearestFile(a:buffer, '.swift-format')
+
+    if l:config_filepath isnot# ''
+        return '--configuration' . ' ' . l:config_filepath
+    endif
+
+    return ''
+endfunction
+
+" }}}
diff --git a/sources_non_forked/ale/autoload/ale/test.vim b/sources_non_forked/ale/autoload/ale/test.vim
index 6fcbf35e..4d75d515 100755
--- a/sources_non_forked/ale/autoload/ale/test.vim
+++ b/sources_non_forked/ale/autoload/ale/test.vim
@@ -34,12 +34,11 @@ function! ale#test#RestoreDirectory() abort
     unlet! g:dir
 endfunction
 
-" Change the filename for the current buffer using a relative path to
-" the script without running autocmd commands.
+" Get a filename for the current buffer using a relative path to the script.
 "
 " If a g:dir variable is set, it will be used as the path to the directory
 " containing the test file.
-function! ale#test#SetFilename(path) abort
+function! ale#test#GetFilename(path) abort
     let l:dir = get(g:, 'dir', '')
 
     if empty(l:dir)
@@ -50,7 +49,17 @@ function! ale#test#SetFilename(path) abort
     \   ? a:path
     \   : l:dir . '/' . a:path
 
-    silent! noautocmd execute 'file ' . fnameescape(ale#path#Simplify(l:full_path))
+    return ale#path#Simplify(l:full_path)
+endfunction
+
+" Change the filename for the current buffer using a relative path to
+" the script without running autocmd commands.
+"
+" If a g:dir variable is set, it will be used as the path to the directory
+" containing the test file.
+function! ale#test#SetFilename(path) abort
+    let l:full_path = ale#test#GetFilename(a:path)
+    silent! noautocmd execute 'file ' . fnameescape(l:full_path)
 endfunction
 
 function! s:RemoveModule(results) abort
diff --git a/sources_non_forked/ale/autoload/ale/util.vim b/sources_non_forked/ale/autoload/ale/util.vim
index 5c41ab83..5b2bfcd7 100755
--- a/sources_non_forked/ale/autoload/ale/util.vim
+++ b/sources_non_forked/ale/autoload/ale/util.vim
@@ -340,6 +340,16 @@ function! ale#util#GetMatches(lines, patterns) abort
     return l:matches
 endfunction
 
+" Given a single line, or a List of lines, and a single pattern, or a List of
+" patterns, and a callback function for mapping the items matches, return the
+" result of mapping all of the matches for the lines from the given patterns,
+" using matchlist()
+"
+" Only the first pattern which matches a line will be returned.
+function! ale#util#MapMatches(lines, patterns, Callback) abort
+    return map(ale#util#GetMatches(a:lines, a:patterns), 'a:Callback(v:val)')
+endfunction
+
 function! s:LoadArgCount(function) abort
     try
         let l:output = execute('function a:function')
diff --git a/sources_non_forked/ale/doc/ale-bazel.txt b/sources_non_forked/ale/doc/ale-bazel.txt
new file mode 100644
index 00000000..e2922aaf
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-bazel.txt
@@ -0,0 +1,28 @@
+===============================================================================
+ALE Bazel Integration                                       *ale-bazel-options*
+
+===============================================================================
+buildifier                                               *ale-bazel-buildifier*
+
+g:ale_bazel_buildifier_executable           *g:ale_bazel_buildifier_executable*
+                                            *b:ale_bazel_buildifier_executable*
+  Type: |String|
+  Default: `'buildifier'`
+
+  See |ale-integrations-local-executables|
+
+
+g:ale_bazel_buildifier_options                 *g:ale_bazel_buildifier_options*
+                                               *b:ale_bazel_buildifier_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be set to pass extra options to buildifier.
+
+
+g:ale_bazel_buildifier_use_global           *g:ale_bazel_buildifier_use_global*
+                                            *b:ale_bazel_buildifier_use_global*
+  Type: |Number|
+  Default: `get(g:, 'ale_use_global_executables', 0)`
+
+  See |ale-integrations-local-executables|
diff --git a/sources_non_forked/ale/doc/ale-cuda.txt b/sources_non_forked/ale/doc/ale-cuda.txt
index 0e53f756..06aa48ce 100755
--- a/sources_non_forked/ale/doc/ale-cuda.txt
+++ b/sources_non_forked/ale/doc/ale-cuda.txt
@@ -21,6 +21,24 @@ g:ale_cuda_nvcc_options                               *g:ale_cuda_nvcc_options*
 
   This variable can be changed to modify flags given to nvcc.
 
+===============================================================================
+clangd                                                        *ale-cuda-clangd*
+
+g:ale_cuda_clangd_executable                     *g:ale_cuda_clangd_executable*
+                                                 *b:ale_cuda_clangd_executable*
+  Type: |String|
+  Default: `'clangd'`
+
+  This variable can be changed to use a different executable for clangd.
+
+
+g:ale_cuda_clangd_options                           *g:ale_cuda_clangd_options*
+                                                    *b:ale_cuda_clangd_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be changed to modify flags given to clangd.
+
 ===============================================================================
 clang-format                                              *ale-cuda-clangformat*
 
diff --git a/sources_non_forked/ale/doc/ale-desktop.txt b/sources_non_forked/ale/doc/ale-desktop.txt
new file mode 100644
index 00000000..62269e9c
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-desktop.txt
@@ -0,0 +1,21 @@
+===============================================================================
+ALE desktop Integration                                   *ale-desktop-options*
+
+
+===============================================================================
+desktop-file-validate                       *ale-desktop-desktop-file-validate*
+
+ALE supports checking .desktop files with `desktop-file-validate.`
+
+
+g:ale_desktop_desktop_file_validate_options
+                                  *g:ale_desktop_desktop_file_validate_options*
+                                  *b:ale_desktop_desktop_file_validate_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be changed to set options for `desktop-file-validate`,
+  such as `'--warn-kde'`.
+
+===============================================================================
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-development.txt b/sources_non_forked/ale/doc/ale-development.txt
index dbbeb2da..7f8ec28f 100755
--- a/sources_non_forked/ale/doc/ale-development.txt
+++ b/sources_non_forked/ale/doc/ale-development.txt
@@ -181,13 +181,17 @@ Generally write tests for any changes you make. The following types of tests
 are recommended for the following types of code.
 
 * New/edited error handler callbacks -> Write tests in `test/handler`
-* New/edited command callbacks       -> Write tests in `test/command_callback`
+* New/edited linter definition       -> Write tests in `test/linter`
 * New/edited fixer functions         -> Write tests in `test/fixers`
 
 Look at existing tests in the codebase for examples of how to write tests.
 Refer to the Vader documentation for general information on how to write Vader
 tests: https://github.com/junegunn/vader.vim
 
+If you need to add any supporting files for tests, such as empty files present
+to test searching upwards through paths for configuration files, they can be
+added to the `test/test-files` directory.
+
 See |ale-development-linter-tests| for more information on how to write linter
 tests.
 
@@ -274,8 +278,8 @@ be written like so. >
   \ '1:Something went wrong',
   \ ]
 <
-Tests for what ALE runs should go in the `test/command_callback` directory,
-and should be written like so. >
+Tests for what ALE runs should go in the `test/linter` directory, and should
+be written like so. >
 
   Before:
     " Load the linter and set up a series of commands, reset linter variables,
@@ -311,6 +315,7 @@ The full list of commands that will be temporarily defined for linter tests
 given the above setup are as follows.
 
 `GivenCommandOutput [...]`         - Define output for ale#command#Run.
+`AssertLinterCwd cwd`              - Check the `cwd` for the linter.
 `AssertLinter executable, command` - Check the executable and command.
 `AssertLinterNotExecuted`          - Check that linters will not be executed.
 `AssertLSPLanguage language`       - Check the language given to an LSP server.
@@ -357,6 +362,7 @@ The full list of commands that will be temporarily defined for fixer tests
 given the above setup are as follows.
 
 `GivenCommandOutput [...]`         - Define output for ale#command#Run.
+`AssertFixerCwd cwd`               - Check the `cwd` for the fixer.
 `AssertFixer results`              - Check the fixer results
 `AssertFixerNotExecuted`           - Check that fixers will not be executed.
 
diff --git a/sources_non_forked/ale/doc/ale-erlang.txt b/sources_non_forked/ale/doc/ale-erlang.txt
index 93ac7915..ede179d1 100755
--- a/sources_non_forked/ale/doc/ale-erlang.txt
+++ b/sources_non_forked/ale/doc/ale-erlang.txt
@@ -71,6 +71,26 @@ g:ale_erlang_erlc_options                           *g:ale_erlang_erlc_options*
   or `-pa`.
 
 
+-------------------------------------------------------------------------------
+erlfmt                                                      *ale-erlang-erlfmt*
+
+g:ale_erlang_erlfmt_executable                 *g:ale_erlang_erlfmt_executable*
+                                               *b:ale_erlang_erlfmt_executable*
+  Type: |String|
+  Default: `'erlfmt'`
+
+  This variable can be changed to specify the erlfmt executable.
+
+
+g:ale_erlang_erlfmt_options                       *g:ale_erlang_erlfmt_options*
+                                                  *b:ale_erlang_erlfmt_options*
+  Type: |String|
+  Default: `''`
+
+  This variable controls additional parameters passed to `erlfmt`, such as
+  `--insert-pragma` or `--print-width`.
+
+
 -------------------------------------------------------------------------------
 syntaxerl                                                *ale-erlang-syntaxerl*
 
diff --git a/sources_non_forked/ale/doc/ale-go.txt b/sources_non_forked/ale/doc/ale-go.txt
index 8364fd5b..d1712064 100755
--- a/sources_non_forked/ale/doc/ale-go.txt
+++ b/sources_non_forked/ale/doc/ale-go.txt
@@ -20,8 +20,8 @@ the benefit of running a number of linters, more than ALE would by default,
 while ensuring it doesn't run any linters known to be slow or resource
 intensive.
 
-g:ale_go_go_executable                                    *g:ale_go_go_options*
-                                                          *b:ale_go_go_options*
+g:ale_go_go_executable                                 *g:ale_go_go_executable*
+                                                       *b:ale_go_go_executable*
 
   Type: |String|
   Default: `'go'`
@@ -194,12 +194,30 @@ g:ale_go_gometalinter_lint_package         *g:ale_go_gometalinter_lint_package*
 ===============================================================================
 gopls                                                            *ale-go-gopls*
 
+gopls is the official Go language server, and is enabled for use with ALE by
+default.
+
+To install the latest stable version of `gopls` to your `$GOPATH`, try the
+following command: >
+
+  GO111MODULE=on go get golang.org/x/tools/gopls@latest
+<
+If `$GOPATH` is readable by ALE, it should probably work without you having to
+do anything else. See the `gopls` README file for more information:
+
+https://github.com/golang/tools/blob/master/gopls/README.md
+
+
 g:ale_go_gopls_executable                           *g:ale_go_gopls_executable*
                                                     *b:ale_go_gopls_executable*
   Type: |String|
   Default: `'gopls'`
 
-  Location of the gopls binary file.
+  See |ale-integrations-local-executables|
+
+  ALE will search for `gopls` in locally installed directories first by
+  default, and fall back on a globally installed `gopls` if it can't be found
+  otherwise.
 
 
 g:ale_go_gopls_options                                 *g:ale_go_gopls_options*
@@ -228,6 +246,18 @@ g:ale_go_gopls_init_options                       *g:ale_go_gopls_init_options*
 
   For a full list of supported analyzers, see:
   https://github.com/golang/tools/blob/master/gopls/doc/analyzers.md
+<<<<<<< HEAD
+=======
+
+
+g:ale_go_gopls_use_global                           *g:ale_go_gopls_use_global*
+                                                    *b:ale_go_gopls_use_global*
+  Type: |String|
+  Default: `get(g:, 'ale_use_global_executables', 0)`
+
+  See |ale-integrations-local-executables|
+
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 
 ===============================================================================
 govet                                                            *ale-go-govet*
@@ -262,6 +292,18 @@ g:ale_go_revive_options                               *g:ale_go_revive_options*
 ===============================================================================
 staticcheck                                                *ale-go-staticcheck*
 
+g:ale_go_staticcheck_executable               *g:ale_go_staticcheck_executable*
+                                              *b:ale_go_staticcheck_executable*
+  Type: |String|
+  Default: `'staticcheck'`
+
+  See |ale-integrations-local-executables|
+
+  ALE will search for `staticcheck` in locally installed directories first by
+  default, and fall back on a globally installed `staticcheck` if it can't be
+  found otherwise.
+
+
 g:ale_go_staticcheck_options                     *g:ale_go_staticcheck_options*
                                                  *b:ale_go_staticcheck_options*
   Type: |String|
@@ -280,5 +322,13 @@ g:ale_go_staticcheck_lint_package           *g:ale_go_staticcheck_lint_package*
   current file.
 
 
+g:ale_go_staticcheck_use_global               *g:ale_go_staticcheck_use_global*
+                                              *b:ale_go_staticcheck_use_global*
+  Type: |String|
+  Default: `get(g:, 'ale_use_global_executables', 0)`
+
+  See |ale-integrations-local-executables|
+
+
 ===============================================================================
   vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-html.txt b/sources_non_forked/ale/doc/ale-html.txt
index c78dc4cd..2c048148 100755
--- a/sources_non_forked/ale/doc/ale-html.txt
+++ b/sources_non_forked/ale/doc/ale-html.txt
@@ -2,13 +2,41 @@
 ALE HTML Integration                                         *ale-html-options*
 
 
+===============================================================================
+angular                                                      *ale-html-angular*
+
+ALE supports language server features for Angular. You can install it via `npm`: >
+
+  $ npm install --save-dev @angular/language-server
+<
+Angular 11 and up are supported.
+
+
+g:ale_html_angular_executable                   *g:ale_html_angular_executable*
+                                                *b:ale_html_angular_executable*
+  Type: |String|
+  Default: `'ngserver'`
+
+  See |ale-integrations-local-executables|
+
+
+g:ale_html_angular_use_global                   *g:ale_html_angular_use_global*
+                                                *b:ale_html_angular_use_global*
+  Type: |String|
+  Default: `get(g:, 'ale_use_global_executables', 0)`
+
+  See |ale-integrations-local-executables|
+
+
 ===============================================================================
 fecs                                                            *ale-html-fecs*
 
-`fecs` options for HTMl is the same as the options for JavaScript,
-and both of them reads `./.fecsrc` as the default configuration file.
+`fecs` options for HTML are the same as the options for JavaScript, and both
+of them read `./.fecsrc` as the default configuration file.
+
 See: |ale-javascript-fecs|.
 
+
 ===============================================================================
 html-beautify                                               *ale-html-beautify*
 
@@ -47,6 +75,40 @@ g:ale_html_htmlhint_use_global                 *g:ale_html_htmlhint_use_global*
   See |ale-integrations-local-executables|
 
 
+
+===============================================================================
+prettier                                                    *ale-html-prettier*
+
+See |ale-javascript-prettier| for information about the available options.
+
+
+===============================================================================
+stylelint                                                  *ale-html-stylelint*
+
+g:ale_html_stylelint_executable               *g:ale_html_stylelint_executable*
+                                              *b:ale_html_stylelint_executable*
+  Type: |String|
+  Default: `'stylelint'`
+
+  See |ale-integrations-local-executables|
+
+
+g:ale_html_stylelint_options                     *g:ale_html_stylelint_options*
+                                                 *b:ale_html_stylelint_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be set to pass additional options to stylelint.
+
+
+g:ale_html_stylelint_use_global               *g:ale_html_stylelint_use_global*
+                                              *b:ale_html_stylelint_use_global*
+  Type: |String|
+  Default: `0`
+
+  See |ale-integrations-local-executables|
+
+
 ===============================================================================
 tidy                                                            *ale-html-tidy*
 
@@ -97,39 +159,6 @@ g:ale_html_tidy_use_global                             *g:html_tidy_use_global*
   See |ale-integrations-local-executables|
 
 
-===============================================================================
-prettier                                                    *ale-html-prettier*
-
-See |ale-javascript-prettier| for information about the available options.
-
-
-===============================================================================
-stylelint                                                  *ale-html-stylelint*
-
-g:ale_html_stylelint_executable               *g:ale_html_stylelint_executable*
-                                              *b:ale_html_stylelint_executable*
-  Type: |String|
-  Default: `'stylelint'`
-
-  See |ale-integrations-local-executables|
-
-
-g:ale_html_stylelint_options                     *g:ale_html_stylelint_options*
-                                                 *b:ale_html_stylelint_options*
-  Type: |String|
-  Default: `''`
-
-  This variable can be set to pass additional options to stylelint.
-
-
-g:ale_html_stylelint_use_global               *g:ale_html_stylelint_use_global*
-                                              *b:ale_html_stylelint_use_global*
-  Type: |String|
-  Default: `0`
-
-  See |ale-integrations-local-executables|
-
-
 ===============================================================================
 write-good                                                *ale-html-write-good*
 
diff --git a/sources_non_forked/ale/doc/ale-nix.txt b/sources_non_forked/ale/doc/ale-nix.txt
index 5b2bd6cb..c38b93db 100755
--- a/sources_non_forked/ale/doc/ale-nix.txt
+++ b/sources_non_forked/ale/doc/ale-nix.txt
@@ -2,6 +2,24 @@
 ALE Nix Integration                                           *ale-nix-options*
 
 
+===============================================================================
+nixfmt                                                         *ale-nix-nixfmt*
+
+g:ale_nix_nixfmt_executable                       *g:ale_nix_nixfmt_executable*
+                                                  *b:ale_nix_nixfmt_executable*
+  Type: String
+  Default: 'nixfmt'
+
+  This variable sets the executable used for nixfmt.
+
+g:ale_nix_nixfmt_options                             *g:ale_nix_nixfmt_options*
+                                                     *b:ale_nix_nixfmt_options*
+  Type: String
+  Default: ''
+
+  This variable can be set to pass additional options to the nixfmt fixer.
+
+
 ===============================================================================
 nixpkgs-fmt                                                 *ale-nix-nixpkgs-fmt*
 
diff --git a/sources_non_forked/ale/doc/ale-pascal.txt b/sources_non_forked/ale/doc/ale-pascal.txt
new file mode 100644
index 00000000..03d9a004
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-pascal.txt
@@ -0,0 +1,24 @@
+===============================================================================
+ALE Pascal Integration                                     *ale-pascal-options*
+
+===============================================================================
+ptop                                                          *ale-pascal-ptop*
+
+g:ale_pascal_ptop_executable                     *g:ale_pascal_ptop_executable*
+                                                 *b:ale_pascal_ptop_executable*
+  Type: |String|
+  Default: `'ptop'`
+
+  This variable can be changed to specify the ptop executable.
+
+
+g:ale_pascal_ptop_options                           *g:ale_pascal_ptop_options*
+                                                    *b:ale_pascal_ptop_options*
+  Type: |String|
+  Default: `''`
+
+This variable can be set to pass additional options to the ptop fixer.
+
+
+===============================================================================
+vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-proto.txt b/sources_non_forked/ale/doc/ale-proto.txt
index 734e23d5..8ab56a14 100755
--- a/sources_non_forked/ale/doc/ale-proto.txt
+++ b/sources_non_forked/ale/doc/ale-proto.txt
@@ -5,14 +5,15 @@ ALE Proto Integration                                         *ale-proto-options
 ===============================================================================
 Integration Information
 
-Linting of `.proto` files requires that the `protoc` binary is installed in the
-system path and that the `protoc-gen-lint` plugin for the `protoc` binary is also
-installed.
-
 To enable `.proto` file linting, update |g:ale_linters| as appropriate:
 >
   " Enable linter for .proto files
-  let g:ale_linters = {'proto': ['protoc-gen-lint']}
+  let g:ale_linters = {'proto': ['protoc-gen-lint', 'protolint']}
+
+To enable `.proto` file fixing, update |g:ale_fixers| as appropriate:
+>
+  " Enable linter for .proto files
+  let b:ale_fixers = {'proto': ['protolint']}
 <
 ===============================================================================
 protoc-gen-lint                                      *ale-proto-protoc-gen-lint*
@@ -29,5 +30,31 @@ g:ale_proto_protoc_gen_lint_options       *g:ale_proto_protoc_gen_lint_options*
   directory of the linted file is always passed as an include path with '-I'
   before any user-supplied options.
 
+===============================================================================
+protolint                                                   *ale-proto-protolint*
+
+  The linter is a pluggable tool that doesn't depend on the `protoc` binary.
+  This supports both linting and fixing.
+  Make sure the binary is available in the system path, or set
+  ale_proto_protolint_executable.
+  Note that the binary with v0.22.0 or above is supported.
+
+g:ale_proto_protolint_executable             *g:ale_proto_protolint_executable*
+
+  Type: |String|
+  Default: 'protolint'
+
+  This variable can be changed to modify the executable used for protolint.
+
+g:ale_proto_protolint_config                     *g:ale_proto_protolint_config*
+
+  Type: |String|
+  Default: `''`
+
+  A path to a protolint configuration file.
+
+  The path to the configuration file can be an absolute path or a relative
+  path. ALE will search for the relative path in parent directories.
+
 ===============================================================================
   vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-python.txt b/sources_non_forked/ale/doc/ale-python.txt
index 1f263e84..d38d3055 100755
--- a/sources_non_forked/ale/doc/ale-python.txt
+++ b/sources_non_forked/ale/doc/ale-python.txt
@@ -688,6 +688,25 @@ g:ale_python_pyls_config                             *g:ale_python_pyls_config*
       \ }
 <
 
+g:ale_python_pyls_options                           *g:ale_python_pyls_options*
+                                                    *b:ale_python_pyls_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be changed to add command-line arguments to the pyls
+  invocation. Note that this is not the same thing as ale_python_pyls_config,
+  which allows configuration of how pyls functions; this is intended to
+  provide flexibility in how the pyls command is invoked.
+
+  For example, if you had installed `pyls` but your `pyls` executable was not
+  on your `PATH` for some reason, an alternative way to run the pyls server
+  would be:
+  let g:ale_python_pyls_executable = 'python3'
+  let g:ale_python_pyls_options = '-m pyls'
+
+  An example stragety for installing `pyls`:
+    `python3 -m pip install --user pyls`
+
 ===============================================================================
 pyre                                                          *ale-python-pyre*
 
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 71abb0a1..e6519e9b 100755
--- a/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt
+++ b/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt
@@ -43,6 +43,8 @@ Notes:
   * `shfmt`
 * Bats
   * `shellcheck`
+* Bazel
+  * `buildifier`
 * BibTeX
   * `bibclean`
 * Bourne Shell
@@ -107,6 +109,7 @@ Notes:
 * Cucumber
   * `cucumber`
 * CUDA
+  * `clangd`
   * `nvcc`!!
 * Cypher
   * `cypher-lint`
@@ -124,6 +127,8 @@ Notes:
   * `dartanalyzer`!!
   * `dartfmt`!!
   * `language_server`
+* desktop
+  * `desktop-file-validate`
 * Dhall
   * `dhall-format`
   * `dhall-freeze`
@@ -148,8 +153,15 @@ Notes:
   * `ruumba`
 * Erlang
   * `SyntaxErl`
+<<<<<<< HEAD
   * `elvis`!!
   * `erlc`
+=======
+  * `dialyzer`
+  * `elvis`!!
+  * `erlc`
+  * `erlfmt`
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 * Fish
   * `fish` (-n flag)
   * `fish_indent`
@@ -163,7 +175,7 @@ Notes:
 * Git Commit Messages
   * `gitlint`
 * GLSL
-  * glslang
+  * `glslang`
   * `glslls`
 * Go
   * `bingo`
@@ -214,8 +226,13 @@ Notes:
 * HTML
   * `HTMLHint`
   * `alex`!!
+  * `angular`
   * `fecs`
   * `html-beautify`
+<<<<<<< HEAD
+=======
+  * `htmlhint`
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   * `prettier`
   * `proselint`
   * `tidy`
@@ -311,6 +328,7 @@ Notes:
   * `nimpretty`
 * nix
   * `nix-instantiate`
+  * `nixfmt`
   * `nixpkgs-fmt`
   * `rnix-lsp`
 * nroff
@@ -336,6 +354,11 @@ Notes:
   * `ibm_validator`
   * `prettier`
   * `yamllint`
+<<<<<<< HEAD
+=======
+* Pascal
+  * `ptop`
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 * Pawn
   * `uncrustify`
 * Perl
@@ -374,6 +397,7 @@ Notes:
   * `swipl`
 * proto
   * `protoc-gen-lint`
+  * `protolint`
 * Pug
   * `pug-lint`
 * Puppet
@@ -482,11 +506,16 @@ Notes:
   * `stylelint`
 * SugarSS
   * `stylelint`
+* Svelte
+  * `prettier`
+  * `svelteserver`
 * Swift
   * Apple `swift-format`
   * `sourcekit-lsp`
   * `swiftformat`
   * `swiftlint`
+* systemd
+  * `systemd-analyze`!!
 * Tcl
   * `nagelfar`!!
 * Terraform
@@ -518,6 +547,9 @@ Notes:
   * `tslint`
   * `tsserver`
   * `typecheck`
+* V
+  * `v`
+  * `vfmt`
 * VALA
   * `uncrustify`
   * `vala_lint`!!
@@ -548,6 +580,7 @@ Notes:
 * XML
   * `xmllint`
 * YAML
+  * `circleci`!!
   * `prettier`
   * `spectral`
   * `swaglint`
@@ -557,3 +590,6 @@ Notes:
   * `yang-lsp`
 * Zig
   * `zls`
+
+===============================================================================
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-svelte.txt b/sources_non_forked/ale/doc/ale-svelte.txt
new file mode 100644
index 00000000..92f109f7
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-svelte.txt
@@ -0,0 +1,31 @@
+===============================================================================
+ALE Svelte Integration                                     *ale-svelte-options*
+
+
+===============================================================================
+prettier                                                  *ale-svelte-prettier*
+
+See |ale-javascript-prettier| for information about the available options.
+
+
+===============================================================================
+svelteserver                                          *ale-svelte-svelteserver*
+
+g:ale_svelte_svelteserver_executable     *g:ale_svelte_svelteserver_executable*
+                                         *b:ale_svelte_svelteserver_executable*
+  Type: |String|
+  Default: `'svelteserver'`
+
+  See |ale-integrations-local-executables|
+
+
+g:ale_svelte_svelteserver_use_global      *g:ale_svelte_svelteserver_use_global*
+                                          *b:ale_svelte_svelteserver_use_global*
+  Type: |Number|
+  Default: `get(g:, 'ale_use_global_executables', 0)`
+
+  See |ale-integrations-local-executables|
+
+
+===============================================================================
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-swift.txt b/sources_non_forked/ale/doc/ale-swift.txt
index 8fa0c06c..6d53ca7c 100755
--- a/sources_non_forked/ale/doc/ale-swift.txt
+++ b/sources_non_forked/ale/doc/ale-swift.txt
@@ -2,6 +2,44 @@
 ALE Swift Integration                                       *ale-swift-options*
 
 
+===============================================================================
+apple-swift-format                               *ale-swift-apple-swift-format*
+
+There are 3 options to enable linting and fixing with Apple's swift-format:
+
+1. Install the local executable in your path, as described here:
+   https://github.com/apple/swift-format
+2. Install the executable via your OS package manager, for instance via
+   Homebrew with `brew install swift-format`
+3. Your Swift project has a dependency on the swift-format package, so it can
+   be run with `swift run swift-format lint ...` In this case, you need to set
+   a variable, see |g:ale_swift_appleswiftformat_use_swiftpm|.
+
+Additionally, ALE tries to locate and use the nearest existing `.swift-format`
+configuration file.
+
+
+g:ale_swift_appleswiftformat_executable *g:ale_swift_appleswiftformat_executable*
+                                      *b:ale_swift_appleswiftformat_executable*
+  Type: |String|
+  Default: `'swift-format'`
+
+  This variable can be modified to change the executable path for
+  `swift-format`.
+
+
+g:ale_swift_appleswiftformat_use_swiftpm *g:ale_swift_appleswiftformat_use_swiftpm*
+                                     *b:ale_swift_appleswiftformat_use_swiftpm*
+  Type: |Number|
+  Default: `0`
+
+  When set to `1`, this option will cause ALE to use
+  `swift run swift-format lint ...` instead of the global executable. Use this
+  option if your Swift project has a dependency on the swift-format package.
+
+  See |ale-integrations-local-executables|
+
+
 ===============================================================================
 sourcekitlsp                                           *ale-swift-sourcekitlsp*
 
@@ -16,6 +54,7 @@ g:ale_sourcekit_lsp_executable                 *g:ale_sourcekit_lsp_executable*
 
   See |ale-integrations-local-executables|
 
+
 ===============================================================================
   vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
 
diff --git a/sources_non_forked/ale/doc/ale-systemd.txt b/sources_non_forked/ale/doc/ale-systemd.txt
new file mode 100644
index 00000000..13c7037f
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-systemd.txt
@@ -0,0 +1,14 @@
+===============================================================================
+ALE systemd Integration                                   *ale-systemd-options*
+
+
+===============================================================================
+systemd-analyze                                           *ale-systemd-analyze*
+
+ALE supports checking user systemd units with `systemd-analyze --user verify`
+Checks will only work with user unit files in their proper location. There
+aren't any options, and checks can only run after saving the file.
+
+
+===============================================================================
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-v.txt b/sources_non_forked/ale/doc/ale-v.txt
new file mode 100644
index 00000000..8c641447
--- /dev/null
+++ b/sources_non_forked/ale/doc/ale-v.txt
@@ -0,0 +1,45 @@
+===============================================================================
+ALE V Integration                                               *ale-v-options*
+
+
+===============================================================================
+Integration Information
+
+`v` is V's build tool. `vfmt` (called as `v fmt` from the same
+executable that does the builds) is the autoformatter/fixer.
+
+g:ale_v_v_executable                                     *g:ale_v_v_executable*
+                                                         *b:ale_v_v_executable*
+
+  Type: |String|
+  Default: `'v'`
+
+  The executable that will be run for the `v` linter and the `vfmt` fixer.
+
+
+===============================================================================
+v                                                                     *ale-v-v*
+
+g:ale_v_v_options                                           *g:ale_v_v_options*
+                                                            *b:ale_v_v_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be set to pass additional options to the v linter.
+  They are injected directly after "v .".
+
+
+===============================================================================
+vfmt                                                               *ale-v-vfmt*
+
+g:ale_v_vfmt_options                                     *g:ale_v_vfmt_options*
+                                                         *b:ale_v_vfmt_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be set to pass additional options to the vfmt fixer.
+  They are injected directly after "v fmt".
+
+
+===============================================================================
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/sources_non_forked/ale/doc/ale-yaml.txt b/sources_non_forked/ale/doc/ale-yaml.txt
index 04871403..fee08252 100755
--- a/sources_non_forked/ale/doc/ale-yaml.txt
+++ b/sources_non_forked/ale/doc/ale-yaml.txt
@@ -1,6 +1,28 @@
 ===============================================================================
 ALE YAML Integration                                         *ale-yaml-options*
 
+
+===============================================================================
+circleci                                                    *ale-yaml-circleci*
+
+Website: https://circleci.com/docs/2.0/local-cli
+
+
+Installation
+-------------------------------------------------------------------------------
+
+Follow the instructions on the website, and make sure to test that you can
+validate configuration files with: >
+
+  circleci config validate - < .circleci/config.yml
+<
+
+As long as the validator runs correctly, you should be able to see errors when
+you save the configuration file. The validator doesn't run as you type because
+it sends network requests, and running too often would overload the circleci
+servers.
+
+
 ===============================================================================
 prettier                                                    *ale-yaml-prettier*
 
@@ -15,6 +37,40 @@ Install prettier either globally or locally: >
   npm install prettier -g  # global
   npm install prettier     # local
 <
+
+===============================================================================
+spectral                                                    *ale-yaml-spectral*
+
+Website: https://github.com/stoplightio/spectral
+
+
+Installation
+-------------------------------------------------------------------------------
+
+Install spectral either globally or locally: >
+
+  npm install @stoplight/spectral -g  # global
+  npm install @stoplight/spectral     # local
+<
+
+Options
+-------------------------------------------------------------------------------
+
+g:ale_yaml_spectral_executable                 *g:ale_yaml_spectral_executable*
+                                               *b:ale_yaml_spectral_executable*
+  Type: |String|
+  Default: `'spectral'`
+
+  This variable can be set to change the path to spectral.
+
+g:ale_yaml_spectral_use_global                 *g:ale_yaml_spectral_use_global*
+                                               *b:ale_yaml_spectral_use_global*
+  Type: |String|
+  Default: `get(g:, 'ale_use_global_executables', 0)`
+
+  See |ale-integrations-local-executables|
+
+
 ===============================================================================
 spectral                                                    *ale-yaml-spectral*
 
@@ -80,6 +136,7 @@ g:ale_yaml_swaglint_use_global                 *g:ale_yaml_swaglint_use_global*
 
   See |ale-integrations-local-executables|
 
+
 ===============================================================================
 yamlfix                                                      *ale-yaml-yamlfix*
 
@@ -118,6 +175,7 @@ g:ale_yaml_yamlfix_use_global                   *g:ale_yaml_yamlfix_use_global*
 
   See |ale-integrations-local-executables|
 
+
 ===============================================================================
 yamllint                                                    *ale-yaml-yamllint*
 
diff --git a/sources_non_forked/ale/doc/ale.txt b/sources_non_forked/ale/doc/ale.txt
index 3031cd1b..0c0d2ee1 100755
--- a/sources_non_forked/ale/doc/ale.txt
+++ b/sources_non_forked/ale/doc/ale.txt
@@ -342,6 +342,12 @@ the buffers being checked.
 When a |Dictionary| is returned for an |ALEFix| callback, the following keys
 are supported for running the commands.
 
+  `cwd`                 An optional |String| for setting the working directory
+                      for the command.
+
+                      If not set, or `v:null`, the `cwd` of the last command
+                      that spawn this one will be used.
+
   `command`             A |String| for the command to run. This key is required.
 
                       When `%t` is included in a command string, a temporary
@@ -555,7 +561,6 @@ vimrc, and your issues should go away. >
 
   set completeopt=menu,menuone,preview,noselect,noinsert
 <
-
 Or alternatively, if you want to show documentation in popups: >
 
   set completeopt=menu,menuone,popup,noselect,noinsert
@@ -647,7 +652,12 @@ Hover information can be displayed in the preview window instead by setting
 |g:ale_hover_to_preview| to `1`.
 
 When using Neovim, if |g:ale_hover_to_floating_preview| or |g:ale_floating_preview|
+<<<<<<< HEAD
 is set to 1, the hover information will show in a floating window.
+=======
+is set to 1, the hover information will show in a floating window. And
+|g:ale_floating_window_border| for the border setting.
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 
 For Vim 8.1+ terminals, mouse hovering is disabled by default. Enabling
 |balloonexpr| commands in terminals can cause scrolling issues in terminals,
@@ -957,8 +967,13 @@ g:ale_default_navigation                             *g:ale_default_navigation*
   buffer, such as for |ALEFindReferences|, or |ALEGoToDefinition|.
 
 
+<<<<<<< HEAD
 g:ale_detail_to_floating_preview                            *g:ale_detail_to_floating_preview*
                                                             *b:ale_detail_to_floating_preview*
+=======
+g:ale_detail_to_floating_preview             *g:ale_detail_to_floating_preview*
+                                             *b:ale_detail_to_floating_preview*
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   Type: |Number|
   Default: `0`
 
@@ -1189,7 +1204,11 @@ g:ale_fix_on_save_ignore                             *g:ale_fix_on_save_ignore*
   let g:ale_fix_on_save_ignore = [g:AddBar]
 <
 
+<<<<<<< HEAD
 g:ale_floating_preview                                       *g:ale_floating_preview*
+=======
+g:ale_floating_preview                                 *g:ale_floating_preview*
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 
   Type: |Number|
   Default: `0`
@@ -1199,6 +1218,22 @@ g:ale_floating_preview                                       *g:ale_floating_pre
   |g:ale_detail_to_floating_preview| to `1`.
 
 
+<<<<<<< HEAD
+=======
+g:ale_floating_window_border                       *g:ale_floating_window_border*
+
+  Type: |List|
+  Default: `['|', '-', '+', '+', '+', '+']`
+
+  When set to `[]`, window borders are disabled. The elements in the list set
+  the horizontal, top, top-left, top-right, bottom-right and bottom-left
+  border characters, respectively.
+
+  If the terminal supports Unicode, you might try setting the value to
+  ` ['│', '─', '╭', '╮', '╯', '╰']`, to make it look nicer.
+
+
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 g:ale_history_enabled                                   *g:ale_history_enabled*
 
   Type: |Number|
@@ -1257,8 +1292,13 @@ g:ale_hover_to_preview                                 *g:ale_hover_to_preview*
   instead of in balloons or the message line.
 
 
+<<<<<<< HEAD
 g:ale_hover_to_floating_preview                       *g:ale_hover_to_floating_preview*
                                                       *b:ale_hover_to_floating_preview*
+=======
+g:ale_hover_to_floating_preview               *g:ale_hover_to_floating_preview*
+                                              *b:ale_hover_to_floating_preview*
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   Type: |Number|
   Default: `0`
 
@@ -1418,6 +1458,7 @@ g:ale_linter_aliases                                     *g:ale_linter_aliases*
   \   'ps1': 'powershell',
   \   'rmarkdown': 'r',
   \   'rmd': 'r',
+  \   'svelte': ['svelte', 'javascript'],
   \   'systemverilog': 'verilog',
   \   'typescriptreact': ['typescript', 'tsx'],
   \   'verilog_systemverilog': ['verilog_systemverilog', 'verilog'],
@@ -1559,7 +1600,7 @@ g:ale_linters                                                   *g:ale_linters*
   \   'apkbuild': ['apkbuild_lint', 'secfixes_check'],
   \   'csh': ['shell'],
   \   'elixir': ['credo', 'dialyxir', 'dogma'],
-  \   'go': ['gofmt', 'golint', 'go vet'],
+  \   'go': ['gofmt', 'golint', 'gopls', 'govet'],
   \   'hack': ['hack'],
   \   'help': [],
   \   'inko': ['inko'],
@@ -1568,9 +1609,11 @@ g:ale_linters                                                   *g:ale_linters*
   \   'python': ['flake8', 'mypy', 'pylint', 'pyright'],
   \   'rust': ['cargo', 'rls'],
   \   'spec': [],
+  \   'svelte': ['eslint', 'svelteserver'],
   \   'text': [],
   \   'vue': ['eslint', 'vls'],
   \   'zsh': ['shell'],
+  \   'v': ['v'],
   \}
 <
   This option can be used to enable only a particular set of linters for a
@@ -1710,6 +1753,7 @@ g:ale_lsp_show_message_severity               *g:ale_lsp_show_message_severity*
 
 
 g:ale_lsp_suggestions                                   *g:ale_lsp_suggestions*
+<<<<<<< HEAD
 
   Type: |Number|
   Default: `0`
@@ -1720,20 +1764,14 @@ g:ale_lsp_suggestions                                   *g:ale_lsp_suggestions*
 
 g:ale_lsp_root                                                 *g:ale_lsp_root*
                                                                *b:ale_lsp_root*
+=======
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 
-  Type: |Dictionary| or |String|
-  Default: {}
+  Type: |Number|
+  Default: `0`
 
-  This option is used to determine the project root for the LSP linter. If the
-  value is a |Dictionary|, it maps a linter to either a string containing the
-  project root or a |Funcref| to call to look up the root. The funcref is
-  provided the buffer number as its argument.
-
-  The buffer-specific variable may additionally be a string containing the
-  project root itself.
-
-  If neither variable yields a result, a linter-specific function is invoked to
-  detect a project root. If this, too, yields no result, the linter is disabled.
+  If set to `1`, show hints/suggestions from LSP servers or tsserver, in
+  addition to warnings and errors.
 
 
 g:ale_max_buffer_history_size                   *g:ale_max_buffer_history_size*
@@ -1880,6 +1918,25 @@ g:ale_rename_tsserver_find_in_strings   *g:ale_rename_tsserver_find_in_strings*
   `1`.
 
 
+g:ale_root                                                         *g:ale_root*
+                                                                   *b:ale_root*
+
+  Type: |Dictionary| or |String|
+  Default: {}
+
+  This option is used to determine the project root for a linter. If the value
+  is a |Dictionary|, it maps a linter to either a |String| containing the
+  project root or a |Funcref| to call to look up the root. The |Funcref| is
+  provided the buffer number as its argument.
+
+  The buffer-specific variable may additionally be a string containing the
+  project root itself.
+
+  If neither variable yields a result, a linter-specific function is invoked to
+  detect a project root. If this, too, yields no result, and the linter is an
+  LSP linter, it will not run.
+
+
 g:ale_set_balloons                                         *g:ale_set_balloons*
                                                            *b:ale_set_balloons*
 
@@ -2614,6 +2671,8 @@ documented in additional help files.
     gawk..................................|ale-awk-gawk|
   bats....................................|ale-bats-options|
     shellcheck............................|ale-bats-shellcheck|
+  bazel...................................|ale-bazel-options|
+    buildifier............................|ale-bazel-buildifier|
   bib.....................................|ale-bib-options|
     bibclean..............................|ale-bib-bibclean|
   c.......................................|ale-c-options|
@@ -2663,6 +2722,7 @@ documented in additional help files.
     stylelint.............................|ale-css-stylelint|
   cuda....................................|ale-cuda-options|
     nvcc..................................|ale-cuda-nvcc|
+    clangd................................|ale-cuda-clangd|
     clang-format..........................|ale-cuda-clangformat|
   d.......................................|ale-d-options|
     dfmt..................................|ale-d-dfmt|
@@ -2674,6 +2734,11 @@ documented in additional help files.
     analysis_server.......................|ale-dart-analysis_server|
     dartanalyzer..........................|ale-dart-dartanalyzer|
     dartfmt...............................|ale-dart-dartfmt|
+<<<<<<< HEAD
+=======
+  desktop.................................|ale-desktop-options|
+    desktop-file-validate.................|ale-desktop-desktop-file-validate|
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   dhall...................................|ale-dhall-options|
     dhall-format..........................|ale-dhall-format|
     dhall-freeze..........................|ale-dhall-freeze|
@@ -2695,6 +2760,7 @@ documented in additional help files.
     dialyzer..............................|ale-erlang-dialyzer|
     elvis.................................|ale-erlang-elvis|
     erlc..................................|ale-erlang-erlc|
+    erlfmt................................|ale-erlang-erlfmt|
     syntaxerl.............................|ale-erlang-syntaxerl|
   eruby...................................|ale-eruby-options|
     ruumba................................|ale-eruby-ruumba|
@@ -2753,12 +2819,13 @@ documented in additional help files.
   hcl.....................................|ale-hcl-options|
     terraform-fmt.........................|ale-hcl-terraform-fmt|
   html....................................|ale-html-options|
+    angular...............................|ale-html-angular|
     fecs..................................|ale-html-fecs|
     html-beautify.........................|ale-html-beautify|
     htmlhint..............................|ale-html-htmlhint|
-    tidy..................................|ale-html-tidy|
     prettier..............................|ale-html-prettier|
     stylelint.............................|ale-html-stylelint|
+    tidy..................................|ale-html-tidy|
     write-good............................|ale-html-write-good|
   idris...................................|ale-idris-options|
     idris.................................|ale-idris-idris|
@@ -2829,6 +2896,7 @@ documented in additional help files.
     nimlsp................................|ale-nim-nimlsp|
     nimpretty.............................|ale-nim-nimpretty|
   nix.....................................|ale-nix-options|
+    nixfmt................................|ale-nix-nixfmt|
     nixpkgs-fmt...........................|ale-nix-nixpkgs-fmt|
   nroff...................................|ale-nroff-options|
     write-good............................|ale-nroff-write-good|
@@ -2851,6 +2919,11 @@ documented in additional help files.
     ibm_validator.........................|ale-openapi-ibm-validator|
     prettier..............................|ale-openapi-prettier|
     yamllint..............................|ale-openapi-yamllint|
+<<<<<<< HEAD
+=======
+  pascal..................................|ale-pascal-options|
+    ptop..................................|ale-pascal-ptop|
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   pawn....................................|ale-pawn-options|
     uncrustify............................|ale-pawn-uncrustify|
   perl....................................|ale-perl-options|
@@ -2884,6 +2957,7 @@ documented in additional help files.
     swipl.................................|ale-prolog-swipl|
   proto...................................|ale-proto-options|
     protoc-gen-lint.......................|ale-proto-protoc-gen-lint|
+    protolint.............................|ale-proto-protolint|
   pug.....................................|ale-pug-options|
     puglint...............................|ale-pug-puglint|
   puppet..................................|ale-puppet-options|
@@ -2983,8 +3057,14 @@ documented in additional help files.
     stylelint.............................|ale-stylus-stylelint|
   sugarss.................................|ale-sugarss-options|
     stylelint.............................|ale-sugarss-stylelint|
+  svelte..................................|ale-svelte-options|
+    prettier..............................|ale-svelte-prettier|
+    svelteserver..........................|ale-svelte-svelteserver|
   swift...................................|ale-swift-options|
+    apple-swift-format....................|ale-swift-apple-swift-format|
     sourcekitlsp..........................|ale-swift-sourcekitlsp|
+  systemd.................................|ale-systemd-options|
+    systemd-analyze.......................|ale-systemd-analyze|
   tcl.....................................|ale-tcl-options|
     nagelfar..............................|ale-tcl-nagelfar|
   terraform...............................|ale-terraform-options|
@@ -3013,6 +3093,12 @@ documented in additional help files.
     tslint................................|ale-typescript-tslint|
     tsserver..............................|ale-typescript-tsserver|
     xo....................................|ale-typescript-xo|
+<<<<<<< HEAD
+=======
+  v.......................................|ale-v-options|
+    v.....................................|ale-v-v|
+    vfmt..................................|ale-v-vfmt|
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   vala....................................|ale-vala-options|
     uncrustify............................|ale-vala-uncrustify|
   verilog/systemverilog...................|ale-verilog-options|
@@ -3039,6 +3125,7 @@ documented in additional help files.
   xml.....................................|ale-xml-options|
     xmllint...............................|ale-xml-xmllint|
   yaml....................................|ale-yaml-options|
+    circleci..............................|ale-yaml-circleci|
     prettier..............................|ale-yaml-prettier|
     spectral..............................|ale-yaml-spectral|
     swaglint..............................|ale-yaml-swaglint|
@@ -3575,6 +3662,12 @@ ale#command#Run(buffer, command, callback, [options])       *ale#command#Run()*
 <
   The following `options` can be provided.
 
+    `cwd`               - An optional |String| for setting the working directory
+                        for the command, just as per |ale#linter#Define|.
+
+                        If not set, or `v:null`, the `cwd` of the last command
+                        that spawned this one will be used.
+
     `output_stream`     - Either `'stdout'`, `'stderr'`, `'both'`, or
                         `'none`' for selecting which output streams to read
                         lines from.
@@ -3684,6 +3777,21 @@ ale#fix#registry#Add(name, func, filetypes, desc, [aliases])
   ALE will search for fixers in the registry first by `name`, then by their
   `aliases`.
 
+  For example to register a custom fixer for `luafmt`: >
+
+  function! FormatLua(buffer) abort
+    return {
+    \   'command': 'luafmt --stdin'
+    \}
+  endfunction
+
+  execute ale#fix#registry#Add('luafmt', 'FormatLua', ['lua'], 'luafmt for lua')
+
+  " You can now use it in g:ale_fixers
+  let g:ale_fixers = {
+    \ 'lua': ['luafmt']
+  }
+<
 
 ale#linter#Define(filetype, linter)                       *ale#linter#Define()*
 
@@ -3800,10 +3908,33 @@ ale#linter#Define(filetype, linter)                       *ale#linter#Define()*
 
                          The result can be computed with |ale#command#Run()|.
 
+                         The command string can be formatted with format
+                         markers. See |ale-command-format-strings|.
+
                          This command will be fed the lines from the buffer to
                          check, and will produce the lines of output given to
                          the `callback`.
 
+  `cwd`                    An optional |String| for setting the working
+                         directory for the command, or a |Funcref| for a
+                         function to call for computing the command, accepting
+                         a buffer number. The working directory can be
+                         specified as a format string for determining the path
+                         dynamically. See |ale-command-format-strings|.
+
+                         To set the working directory to the directory
+                         containing the file you're checking, you should
+                         probably use `'%s:h'` as the option value.
+
+                         If this option is absent or the string is empty, the
+                         `command` will be run with no determined working
+                         directory in particular.
+
+                         The directory specified with this option will be used
+                         as the default working directory for all commands run
+                         in a chain with |ale#command#Run()|, unless otherwise
+                         specified.
+
   `output_stream`          A |String| for the output stream the lines of output
                          should be read from for the command which is run. The
                          accepted values are `'stdout'`, `'stderr'`, and
diff --git a/sources_non_forked/ale/plugin/ale.vim b/sources_non_forked/ale/plugin/ale.vim
index 845586be..76631718 100755
--- a/sources_non_forked/ale/plugin/ale.vim
+++ b/sources_non_forked/ale/plugin/ale.vim
@@ -87,8 +87,8 @@ let g:ale_lint_on_save = get(g:, 'ale_lint_on_save', 1)
 " This flag can be set to 1 to enable linting when the filetype is changed.
 let g:ale_lint_on_filetype_changed = get(g:, 'ale_lint_on_filetype_changed', 1)
 
-" This Dictionary configures the default LSP roots for various linters.
-let g:ale_lsp_root = get(g:, 'ale_lsp_root', {})
+" If set to 1, hints and suggestion from LSP servers and tsserver will be shown.
+let g:ale_lsp_suggestions = get(g:, 'ale_lsp_suggestions', 0)
 
 " If set to 1, hints and suggestion from LSP servers and tsserver will be shown.
 let g:ale_lsp_suggestions = get(g:, 'ale_lsp_suggestions', 0)
@@ -104,6 +104,9 @@ let g:ale_enabled = get(g:, 'ale_enabled', 1)
 " mapping filename paths from one system to another.
 let g:ale_filename_mappings = get(g:, 'ale_filename_mappings', {})
 
+" This Dictionary configures the default project roots for various linters.
+let g:ale_root = get(g:, 'ale_root', {})
+
 " These flags dictates if ale uses the quickfix or the loclist (loclist is the
 " default, quickfix overrides loclist).
 let g:ale_set_loclist = get(g:, 'ale_set_loclist', 1)
@@ -150,6 +153,14 @@ let g:ale_hover_to_floating_preview = get(g:, 'ale_hover_to_floating_preview', 0
 " Detail uses floating windows in Neovim
 let g:ale_detail_to_floating_preview = get(g:, 'ale_detail_to_floating_preview', 0)
 
+<<<<<<< HEAD
+=======
+" Border setting for floating preview windows in Neovim
+" The element in the list presents - horizontal, top, top-left, top-right,
+" bottom-right and bottom-left
+let g:ale_floating_window_border = get(g:, 'ale_floating_window_border', ['|', '-', '+', '+', '+', '+'])
+
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 " This flag can be set to 0 to disable warnings for trailing whitespace
 let g:ale_warn_about_trailing_whitespace = get(g:, 'ale_warn_about_trailing_whitespace', 1)
 " This flag can be set to 0 to disable warnings for trailing blank lines
diff --git a/sources_non_forked/ale/supported-tools.md b/sources_non_forked/ale/supported-tools.md
index 7e74372d..2b3509a0 100755
--- a/sources_non_forked/ale/supported-tools.md
+++ b/sources_non_forked/ale/supported-tools.md
@@ -52,6 +52,8 @@ formatting.
   * [shfmt](https://github.com/mvdan/sh)
 * Bats
   * [shellcheck](https://www.shellcheck.net/)
+* Bazel
+  * [buildifier](https://github.com/bazelbuild/buildtools)
 * BibTeX
   * [bibclean](http://ftp.math.utah.edu/pub/bibclean/)
 * Bourne Shell
@@ -116,6 +118,7 @@ formatting.
 * Cucumber
   * [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)
 * Cypher
   * [cypher-lint](https://github.com/cleishm/libcypher-parser)
@@ -133,6 +136,8 @@ formatting.
   * [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)
   * [language_server](https://github.com/natebosch/dart_language_server)
+* desktop
+  * [desktop-file-validate](https://www.freedesktop.org/wiki/Software/desktop-file-utils/)
 * Dhall
   * [dhall-format](https://github.com/dhall-lang/dhall-lang)
   * [dhall-freeze](https://github.com/dhall-lang/dhall-lang)
@@ -157,8 +162,15 @@ formatting.
   * [ruumba](https://github.com/ericqweinstein/ruumba)
 * Erlang
   * [SyntaxErl](https://github.com/ten0s/syntaxerl)
+<<<<<<< HEAD
   * [elvis](https://github.com/inaka/elvis) :floppy_disk:
   * [erlc](http://erlang.org/doc/man/erlc.html)
+=======
+  * [dialyzer](http://erlang.org/doc/man/dialyzer.html)
+  * [elvis](https://github.com/inaka/elvis) :floppy_disk:
+  * [erlc](http://erlang.org/doc/man/erlc.html)
+  * [erlfmt](https://github.com/WhatsApp/erlfmt)
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 * Fish
   * fish [-n flag](https://linux.die.net/man/1/fish)
   * [fish_indent](https://fishshell.com/docs/current/cmds/fish_indent.html)
@@ -185,7 +197,11 @@ formatting.
   * [golangserver](https://github.com/sourcegraph/go-langserver) :warning:
   * [golint](https://godoc.org/github.com/golang/lint)
   * [gometalinter](https://github.com/alecthomas/gometalinter) :warning: :floppy_disk:
+<<<<<<< HEAD
   * [gopls](https://github.com/golang/go/wiki/gopls) :warning:
+=======
+  * [gopls](https://github.com/golang/go/wiki/gopls)
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   * [gosimple](https://github.com/dominikh/go-tools/tree/master/cmd/gosimple) :warning: :floppy_disk:
   * [gotype](https://godoc.org/golang.org/x/tools/cmd/gotype) :warning: :floppy_disk:
   * [revive](https://github.com/mgechev/revive) :warning: :floppy_disk:
@@ -223,8 +239,13 @@ formatting.
 * HTML
   * [HTMLHint](http://htmlhint.com/)
   * [alex](https://github.com/wooorm/alex) :floppy_disk:
+  * [angular](https://www.npmjs.com/package/@angular/language-server)
   * [fecs](http://fecs.baidu.com/)
   * [html-beautify](https://beautifier.io/)
+<<<<<<< HEAD
+=======
+  * [htmlhint](http://htmlhint.com/)
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   * [prettier](https://github.com/prettier/prettier)
   * [proselint](http://proselint.com/)
   * [tidy](http://www.html-tidy.org/)
@@ -320,6 +341,7 @@ formatting.
   * nimpretty
 * nix
   * [nix-instantiate](http://nixos.org/nix/manual/#sec-nix-instantiate)
+  * [nixfmt](https://github.com/serokell/nixfmt)
   * [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt)
   * [rnix-lsp](https://github.com/nix-community/rnix-lsp)
 * nroff
@@ -345,6 +367,11 @@ formatting.
   * [ibm_validator](https://github.com/IBM/openapi-validator)
   * [prettier](https://github.com/prettier/prettier)
   * [yamllint](https://yamllint.readthedocs.io/)
+<<<<<<< HEAD
+=======
+* Pascal
+  * [ptop](https://www.freepascal.org/tools/ptop.var)
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 * Pawn
   * [uncrustify](https://github.com/uncrustify/uncrustify)
 * Perl
@@ -383,6 +410,7 @@ formatting.
   * [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)
 * Pug
   * [pug-lint](https://github.com/pugjs/pug-lint)
 * Puppet
@@ -491,11 +519,16 @@ formatting.
   * [stylelint](https://github.com/stylelint/stylelint)
 * SugarSS
   * [stylelint](https://github.com/stylelint/stylelint)
+* Svelte
+  * [prettier](https://github.com/prettier/prettier)
+  * [svelteserver](https://github.com/sveltejs/language-tools/tree/master/packages/language-server)
 * Swift
   * [Apple swift-format](https://github.com/apple/swift-format)
   * [sourcekit-lsp](https://github.com/apple/sourcekit-lsp)
   * [swiftformat](https://github.com/nicklockwood/SwiftFormat)
   * [swiftlint](https://github.com/realm/SwiftLint)
+* systemd
+  * [systemd-analyze](https://www.freedesktop.org/software/systemd/man/systemd-analyze.html) :floppy_disk:
 * Tcl
   * [nagelfar](http://nagelfar.sourceforge.net) :floppy_disk:
 * Terraform
@@ -527,6 +560,9 @@ formatting.
   * [tslint](https://github.com/palantir/tslint)
   * [tsserver](https://github.com/Microsoft/TypeScript/wiki/Standalone-Server-%28tsserver%29)
   * typecheck
+* V
+  * [v](https://github.com/vlang/v/)
+  * [vfmt](https://github.com/vlang/v/)
 * VALA
   * [uncrustify](https://github.com/uncrustify/uncrustify)
   * [vala_lint](https://github.com/vala-lang/vala-lint) :floppy_disk:
@@ -557,6 +593,7 @@ formatting.
 * XML
   * [xmllint](http://xmlsoft.org/xmllint.html)
 * YAML
+  * [circleci](https://circleci.com/docs/2.0/local-cli) :floppy_disk:
   * [prettier](https://github.com/prettier/prettier)
   * [spectral](https://github.com/stoplightio/spectral)
   * [swaglint](https://github.com/byCedric/swaglint)
diff --git a/sources_non_forked/bufexplorer/README.md b/sources_non_forked/bufexplorer/README.md
index 2987bdd9..6faed6bc 100755
--- a/sources_non_forked/bufexplorer/README.md
+++ b/sources_non_forked/bufexplorer/README.md
@@ -69,7 +69,7 @@ This plugin can also be found at http://www.vim.org/scripts/script.php?script_id
         git clone https://github.com/jlanzarotta/bufexplorer.git ~/.vim/bundle/bufexplorer.vim
 
 ## License
-Copyright (c) 2001-2020, Jeff Lanzarotta
+Copyright (c) 2001-2021, Jeff Lanzarotta
 
 All rights reserved.
 
diff --git a/sources_non_forked/ctrlp.vim/readme.md b/sources_non_forked/ctrlp.vim/readme.md
index 2f4c6aed..6ab8b246 100755
--- a/sources_non_forked/ctrlp.vim/readme.md
+++ b/sources_non_forked/ctrlp.vim/readme.md
@@ -105,5 +105,5 @@ CtrlP is distributed under Vim's [license][4].
 
 [1]: http://i.imgur.com/aOcwHwt.png
 [2]: https://github.com/ctrlpvim/ctrlp.vim/tree/extensions
-[3]: http://ctrlpvim.github.com/ctrlp.vim#installation
+[3]: http://ctrlpvim.github.io/ctrlp.vim#installation
 [4]: http://vimdoc.sourceforge.net/htmldoc/uganda.html
diff --git a/sources_non_forked/lightline-ale/README.md b/sources_non_forked/lightline-ale/README.md
index 4f1e2b52..78a1e853 100755
--- a/sources_non_forked/lightline-ale/README.md
+++ b/sources_non_forked/lightline-ale/README.md
@@ -16,7 +16,7 @@ This plugin provides [ALE](https://github.com/w0rp/ale) indicator for the [light
 Install using a plugin manager of your choice, for example:
 
 ```viml
-call dein#add('w0rp/ale')                 " Dependency: linter
+call dein#add('dense-analysis/ale')       " Dependency: linter
 call dein#add('itchyny/lightline.vim')    " Dependency: status line
 call dein#add('maximbaz/lightline-ale')
 ```
@@ -55,6 +55,17 @@ let g:lightline.component_type = {
 let g:lightline.active = { 'right': [[ 'linter_checking', 'linter_errors', 'linter_warnings', 'linter_infos', 'linter_ok' ]] }
 ```
 
+3.1. Lineinfo, fileformat, etc. have to be added additionaly. Final example:
+
+```viml
+let g:lightline.active = {
+            \ 'right': [ [ 'linter_checking', 'linter_errors', 'linter_warnings', 'linter_infos', 'linter_ok' ],
+            \            [ 'lineinfo' ],
+	    \            [ 'percent' ],
+	    \            [ 'fileformat', 'fileencoding', 'filetype'] ] }
+
+```
+            
 ## Configuration
 
 ##### `g:lightline#ale#indicator_checking`
diff --git a/sources_non_forked/lightline.vim/LICENSE b/sources_non_forked/lightline.vim/LICENSE
index ee9e0c80..3aab9e6a 100755
--- a/sources_non_forked/lightline.vim/LICENSE
+++ b/sources_non_forked/lightline.vim/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2020 itchyny
+Copyright (c) 2013-2021 itchyny
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/sources_non_forked/lightline.vim/README.md b/sources_non_forked/lightline.vim/README.md
index 41f98022..c2975e05 100755
--- a/sources_non_forked/lightline.vim/README.md
+++ b/sources_non_forked/lightline.vim/README.md
@@ -11,44 +11,29 @@ https://github.com/itchyny/lightline.vim
 
 ![lightline.vim - wombat](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/wombat.png)
 
-### jellybeans
+### solarized (`background=dark`)
 
-![lightline.vim - jellybeans](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/jellybeans.png)
+![lightline.vim - solarized_dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/solarized_dark.png)
 
-### solarized dark
+### solarized (`background=light`)
 
-![lightline.vim - solarized dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/solarized_dark.png)
+![lightline.vim - solarized_light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/solarized_light.png)
 
-### solarized light
+### PaperColor (`background=dark`)
 
-![lightline.vim - solarized light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/solarized_light.png)
+![lightline.vim - PaperColor_dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/PaperColor_dark.png)
 
-### PaperColor dark
+### PaperColor (`background=light`)
 
-![lightline.vim - PaperColor dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/PaperColor_dark.png)
+![lightline.vim - PaperColor_light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/PaperColor_light.png)
 
-### PaperColor light
+### one (`background=dark`)
 
-![lightline.vim - PaperColor light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/PaperColor_light.png)
+![lightline.vim - one_dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/one_dark.png)
 
-### seoul256
-
-![lightline.vim - seoul256](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/seoul256.png)
-
-### one dark
-
-![lightline.vim - one dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/one_dark.png)
-
-### one light
-
-![lightline.vim - one light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/one_light.png)
-
-### landscape
-
-![lightline.vim - landscape](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/landscape.png)
-
-landscape is my colorscheme, which is a high-contrast cterm-supported colorscheme, available at https://github.com/itchyny/landscape.vim
+### one (`background=light`)
 
+![lightline.vim - one_light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/one_light.png)
 
 For screenshots of all available colorshemes, see [this file](colorscheme.md).
 
diff --git a/sources_non_forked/lightline.vim/autoload/lightline/colorscheme/apprentice.vim b/sources_non_forked/lightline.vim/autoload/lightline/colorscheme/apprentice.vim
new file mode 100644
index 00000000..77d40bad
--- /dev/null
+++ b/sources_non_forked/lightline.vim/autoload/lightline/colorscheme/apprentice.vim
@@ -0,0 +1,46 @@
+" =============================================================================
+" Filename: autoload/lightline/colorscheme/apprentice.vim
+" Author: pt307 (based on work by romainl)
+" License: MIT License
+" Last Change: 2021/03/02 18:25:22.
+" =============================================================================
+
+" For the Apprentice colorscheme <https://github.com/romainl/Apprentice>
+
+let s:almost_black = [ '#1c1c1c', 234 ]
+let s:darker_grey  = [ '#262626', 235 ]
+let s:medium_grey  = [ '#585858', 240 ]
+let s:lighter_grey = [ '#bcbcbc', 250 ]
+let s:green        = [ '#5f875f',  65 ]
+let s:red          = [ '#af5f5f', 131 ]
+let s:orange       = [ '#ff8700', 208 ]
+let s:ocre         = [ '#87875f', 101 ]
+let s:yellow       = [ '#ffffaf', 229 ]
+
+let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
+
+let s:p.normal.left     = [ [ s:darker_grey, s:ocre ], [ s:darker_grey, s:medium_grey ] ]
+let s:p.normal.middle   = [ [ s:lighter_grey, s:darker_grey ] ]
+let s:p.normal.right    = [ [ s:darker_grey, s:ocre ], [ s:darker_grey, s:medium_grey ] ]
+let s:p.normal.warning  = [ [ s:almost_black, s:orange ] ]
+let s:p.normal.error    = [ [ s:almost_black, s:red ] ]
+
+let s:p.inactive.left   = [ [ s:darker_grey, s:medium_grey ] ]
+let s:p.inactive.middle = [ [ s:medium_grey, s:darker_grey ] ]
+let s:p.inactive.right  = [ [ s:darker_grey, s:medium_grey ] ]
+
+let s:p.insert.left     = [ [ s:darker_grey, s:green ], [ s:darker_grey, s:medium_grey ] ]
+let s:p.insert.right    = [ [ s:darker_grey, s:green ], [ s:darker_grey, s:medium_grey ] ]
+
+let s:p.replace.left    = [ [ s:darker_grey, s:red ], [ s:darker_grey, s:medium_grey ] ]
+let s:p.replace.right   = [ [ s:darker_grey, s:red ], [ s:darker_grey, s:medium_grey ] ]
+
+let s:p.visual.left     = [ [ s:darker_grey, s:yellow ], [ s:darker_grey, s:medium_grey ] ]
+let s:p.visual.right    = [ [ s:darker_grey, s:yellow ], [ s:darker_grey, s:medium_grey ] ]
+
+let s:p.tabline.left    = [ [ s:darker_grey, s:medium_grey ] ]
+let s:p.tabline.middle  = [ [ s:lighter_grey, s:darker_grey ] ]
+let s:p.tabline.right   = [ [ s:darker_grey, s:medium_grey ] ]
+let s:p.tabline.tabsel  = [ [ s:darker_grey, s:ocre ] ]
+
+let g:lightline#colorscheme#apprentice#palette = lightline#colorscheme#flatten(s:p)
diff --git a/sources_non_forked/lightline.vim/colorscheme.md b/sources_non_forked/lightline.vim/colorscheme.md
index fefe85fe..e9dd87f6 100755
--- a/sources_non_forked/lightline.vim/colorscheme.md
+++ b/sources_non_forked/lightline.vim/colorscheme.md
@@ -16,45 +16,45 @@
 
 ![lightline.vim - OldHope](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/OldHope.png)
 
-### PaperColor dark
+### PaperColor (`background=dark`)
 
-![lightline.vim - PaperColor dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/PaperColor_dark.png)
+![lightline.vim - PaperColor_dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/PaperColor_dark.png)
 
-### PaperColor light
+### PaperColor (`background=light`)
 
-![lightline.vim - PaperColor light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/PaperColor_light.png)
+![lightline.vim - PaperColor_light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/PaperColor_light.png)
 
 ### Tomorrow
 
 ![lightline.vim - Tomorrow](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/Tomorrow.png)
 
-### Tomorrow Night
+### Tomorrow_Night
 
-![lightline.vim - Tomorrow Night](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/Tomorrow_Night.png)
+![lightline.vim - Tomorrow_Night](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/Tomorrow_Night.png)
 
-### Tomorrow Night Blue
+### Tomorrow_Night_Blue
 
-![lightline.vim - Tomorrow Night Blue](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/Tomorrow_Night_Blue.png)
+![lightline.vim_- Tomorrow_Night_Blue](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/Tomorrow_Night_Blue.png)
 
-### Tomorrow Night Bright
+### Tomorrow_Night_Bright
 
-![lightline.vim - Tomorrow Night Bright](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/Tomorrow_Night_Bright.png)
+![lightline.vim - Tomorrow_Night_Bright](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/Tomorrow_Night_Bright.png)
 
-### Tomorrow Night Eighties
+### Tomorrow_Night_Eighties
 
-![lightline.vim - Tomorrow Night Eighties](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/Tomorrow_Night_Eighties.png)
+![lightline.vim - Tomorrow_Night_Eighties](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/Tomorrow_Night_Eighties.png)
 
 ### ayu_mirage
 
-![lightline.vim - ayu mirage](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/ayu_mirage.png)
+![lightline.vim - ayu_mirage](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/ayu_mirage.png)
 
 ### ayu_light
 
-![lightline.vim - ayu light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/ayu_light.png)
+![lightline.vim - ayu_light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/ayu_light.png)
 
 ### ayu_dark
 
-![lightline.vim - ayu dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/ayu_dark.png)
+![lightline.vim - ayu_dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/ayu_dark.png)
 
 ### darcula
 
@@ -68,29 +68,29 @@
 
 ![lightline.vim - jellybeans](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/jellybeans.png)
 
-### selenized dark
+### selenized_dark
 
-![lightline.vim - selenized dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/selenized_dark.png)
+![lightline.vim - selenized_dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/selenized_dark.png)
 
-### selenized black
+### selenized_black
 
-![lightline.vim - selenized black](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/selenized_black.png)
+![lightline.vim - selenized_black](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/selenized_black.png)
 
-### selenized light
+### selenized_light
 
-![lightline.vim - selenized light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/selenized_light.png)
+![lightline.vim - selenized_light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/selenized_light.png)
 
-### selenized white
+### selenized_white
 
-![lightline.vim - selenized white](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/selenized_white.png)
+![lightline.vim - selenized_white](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/selenized_white.png)
 
-### solarized dark
+### solarized (`background=dark`)
 
-![lightline.vim - solarized dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/solarized_dark.png)
+![lightline.vim - solarized_dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/solarized_dark.png)
 
-### solarized light
+### solarized (`background=light`)
 
-![lightline.vim - solarized light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/solarized_light.png)
+![lightline.vim - solarized_light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/solarized_light.png)
 
 ### materia
 
@@ -112,13 +112,13 @@
 
 ![lightline.vim - seoul256](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/seoul256.png)
 
-### one dark
+### one (`background=dark`)
 
-![lightline.vim - one dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/one_dark.png)
+![lightline.vim - one_dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/one_dark.png)
 
-### one light
+### one (`background=light`)
 
-![lightline.vim - one light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/one_light.png)
+![lightline.vim - one_light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/one_light.png)
 
 ### srcery_drk
 
@@ -128,14 +128,18 @@
 
 ![lightline.vim - simpleblack](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/simpleblack.png)
 
+### apprentice
+
+![lightline.vim - apprentice](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/apprentice.png)
+
 ### landscape
 
 ![lightline.vim - landscape](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/landscape.png)
 
-### 16color dark
+### 16color (`background=dark`)
 
-![lightline.vim - 16color dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/16color_dark.png)
+![lightline.vim - 16color_dark](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/16color_dark.png)
 
-### 16color light
+### 16color (`background=light`)
 
-![lightline.vim - 16color light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/16color_light.png)
+![lightline.vim - 16color_light](https://raw.githubusercontent.com/wiki/itchyny/lightline.vim/image/16color_light.png)
diff --git a/sources_non_forked/lightline.vim/doc/lightline.txt b/sources_non_forked/lightline.vim/doc/lightline.txt
index bebc1e04..b021dd22 100755
--- a/sources_non_forked/lightline.vim/doc/lightline.txt
+++ b/sources_non_forked/lightline.vim/doc/lightline.txt
@@ -232,8 +232,23 @@ OPTIONS						*lightline-option*
 		Tomorrow, Tomorrow_Night, Tomorrow_Night_Blue,
 		Tomorrow_Night_Bright, Tomorrow_Night_Eighties, PaperColor,
 		landscape, one, materia, material, OldHope, nord, deus,
+<<<<<<< HEAD
 		simpleblack, srcery_drk, ayu_mirage, ayu_light, ayu_dark and
 		16color are available.
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+		srcery_drk, ayu_mirage and 16color are available.
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+		simpleblack, srcery_drk, ayu_mirage, ayu_light, ayu_dark and
+		16color are available.
+>>>>>>> master
+=======
+		simpleblack, srcery_drk, ayu_mirage, ayu_light, ayu_dark,
+		apprentice and 16color are available.
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 		The default value is:
 >
 		let g:lightline.colorscheme = 'default'
@@ -306,9 +321,6 @@ Exposed functions for lightline.vim.
 	lightline#update()			*lightline#update()*
 		Updates all the statuslines of existing windows.
 
-	lightline#update_once()			*lightline#update_once()*
-		Updates the statuslines only once.
-
 	lightline#enable()			*lightline#enable()*
 		Enables |lightline|.
 
diff --git a/sources_non_forked/mru.vim/README b/sources_non_forked/mru.vim/README
new file mode 100644
index 00000000..04c3a748
--- /dev/null
+++ b/sources_non_forked/mru.vim/README
@@ -0,0 +1,192 @@
+This is a mirror of http://www.vim.org/scripts/script.php?script_id=521
+
+Overview
+
+The Most Recently Used (MRU) plugin provides an easy access to a list of
+recently opened/edited files in Vim. This plugin automatically stores the
+file names as you open/edit them in Vim.
+
+This plugin will work on all the platforms where Vim is supported. This
+plugin will work in both console and GUI Vim. This version of the MRU
+plugin needs Vim 7.0 and above. If you are using an earlier version of
+Vim, then you should use an older version of the MRU plugin.
+
+The recently used filenames are stored in a file specified by the Vim
+MRU_File variable.
+
+The Github repository for the MRU plugin is available at:
+
+      http://github.com/yegappan/mru
+
+Usage
+
+To list and edit files from the MRU list, you can use the ":MRU" command.
+The ":MRU" command displays the MRU file list in a temporary Vim window.  If
+the MRU window is already opened, then the MRU list displayed in the window
+is refreshed.
+
+If you are using GUI Vim, then the names of the recently edited files are
+added to the "File->Recent Files" menu. You can select the name of a file
+from this sub-menu to edit the file.
+
+You can use the normal Vim commands to move around in the MRU window. You
+cannot make changes in the MRU window.
+
+You can select a file name to edit by pressing the <Enter> key or by double
+clicking the left mouse button on a file name.  The selected file will be
+opened. If the file is already opened in a window, the cursor will be moved
+to that window. Otherwise, the file is opened in the previous window. If the
+previous window has a modified buffer or is the preview window or is used by
+some other plugin, then the file is opened in a new window.
+
+You can press the 'o' key to open the file name under the cursor in the
+MRU window in a new window. You can also press <Shift-Enter> instead of 'o'
+to open the file in a new window.
+
+To open a file from the MRU window in read-only mode (view), press the 'v'
+key.
+
+To open a file from the MRU window in a new tab, press the 't' key.  If the
+file is already opened in a window in the current or in another tab, then
+the cursor is moved to that tab. Otherwise, a new tab is opened.
+
+You can open multiple files from the MRU window by specifying a count before
+pressing '<Enter>' or 'v' or 'o' or 't'. You can also visually (using
+linewise visual mode) select multiple filenames and invoke the commands to
+open the files. Each selected file will be opened in a separate window or
+tab.
+
+You can press the 'u' key in the MRU window to update the file list. This is
+useful if you keep the MRU window open always.
+
+You can close the MRU window by pressing the 'q' key or the <Esc> key or
+using one of the Vim window commands.
+
+To display only files matching a pattern from the MRU list in the MRU
+window, you can specify a pattern to the ":MRU" command. For example, to
+display only file names matching "vim" in them, you can use the following
+command ":MRU vim".  When you specify a partial file name and only one
+matching filename is found, then the ":MRU" command will edit that file.
+
+The ":MRU" command supports command-line completion of file names from
+the MRU list. You can enter a partial file name and then press <Tab>
+or <Ctrl-D> to complete or list all the matching file names. Note that
+after typing the ":MRU" command, you have to enter a space before completing
+the file names with <Tab>.
+
+When a file supplied to the ":MRU" command is not present in the MRU list,
+but it is a readable file, then the file will be opened (even though it is
+not present in the MRU list). This is useful if you want to open a file
+present in the same directory as a file in the MRU list. You can use the
+command-line completion of the ":MRU" command to complete the full path of a
+file and then modify the path to open another file present in the same path.
+
+Whenever the MRU list changes, the MRU file is updated with the latest MRU
+list. When you have multiple instances of Vim running at the same time, the
+latest MRU list will show up in all the instances of Vim.
+
+The MRUFilename syntax group is used to highlight the file names in the MRU
+window. By default, this syntax group is linked to the Identifier highlight
+group. You can change the highlight group by adding the following line in
+your .vimrc:
+
+   highlight link MRUFileName LineNr
+
+The MRU buffer uses the 'mru file type. You can use this file type to add
+custom auto commands, syntax highlighting, etc.
+
+Configuration
+
+By changing the following variables you can configure the behavior of this
+plugin. Set the following variables in your .vimrc file using the 'let'
+command.
+
+The list of recently edited file names is stored in the file specified by the
+MRU_File variable.  The default setting for this variable is
+$HOME/.vim_mru_files for Unix-like systems and $USERPROFILE/_vim_mru_files
+for MS-Windows systems. You can change this variable to point to a file by
+adding the following line to the .vimrc file:
+
+      let MRU_File = 'd:\myhome\_vim_mru_files'
+
+By default, the plugin will remember the names of the last 100 used files.
+As you edit more files, old file names will be removed from the MRU list.
+You can set the 'MRU_Max_Entries' variable to remember more file names. For
+example, to remember 1000 most recently used file names, you can use
+
+      let MRU_Max_Entries = 1000
+
+By default, all the edited file names will be added to the MRU list. If you
+want to exclude file names matching a list of patterns, you can set the
+MRU_Exclude_Files variable to a list of Vim regular expressions. By default,
+this variable is set to an empty string. For example, to not include files
+in the temporary (/tmp, /var/tmp and d:\temp) directories, you can set the
+MRU_Exclude_Files variable to
+
+      let MRU_Exclude_Files = '^/tmp/.*\|^/var/tmp/.*'  " For Unix
+      let MRU_Exclude_Files = '^c:\\temp\\.*'           " For MS-Windows
+
+The specified pattern should be a Vim regular expression pattern.
+
+If you want to add only file names matching a set of patterns to the MRU
+list, then you can set the MRU_Include_Files variable. This variable should
+be set to a Vim regular expression pattern. For example, to add only .c and
+.h files to the MRU list, you can set this variable as below:
+
+      let MRU_Include_Files = '\.c$\|\.h$'
+
+By default, MRU_Include_Files is set to an empty string and all the edited
+filenames are added to the MRU list.
+
+The default height of the MRU window is 8. You can set the MRU_Window_Height
+variable to change the window height.
+
+      let MRU_Window_Height = 15
+
+By default, when the :MRU command is invoked, the MRU list will be displayed
+in a new window. Instead, if you want the MRU plugin to reuse the current
+window, then you can set the 'MRU_Use_Current_Window' variable to one.
+
+      let MRU_Use_Current_Window = 1
+
+The MRU plugin will reuse the current window. When a file name is selected,
+the file is also opened in the current window.
+
+When you select a file from the MRU window, the MRU window will be
+automatically closed and the selected file will be opened in the previous
+window. You can set the 'MRU_Auto_Close' variable to zero to keep the MRU
+window open.
+
+      let MRU_Auto_Close = 0
+
+If you don't use the "File->Recent Files" menu and want to disable it,
+then you can set the 'MRU_Add_Menu' variable to zero. By default, the
+menu is enabled.
+
+      let MRU_Add_Menu = 0
+
+If too many file names are present in the MRU list, then updating the MRU
+menu to list all the file names makes Vim slow. To avoid this, the
+MRU_Max_Menu_Entries variable controls the number of file names to show in
+the MRU menu. By default, this is set to 10. You can change this to show
+more entries in the menu.
+
+      let MRU_Max_Menu_Entries = 20
+
+If many file names are present in the MRU list, then the MRU menu is split
+into sub-menus. Each sub-menu contains MRU_Max_Submenu_Entries file names.
+The default setting for this is 10. You can change this to increase the
+number of file names displayed in a single sub-menu:
+
+      let MRU_Max_Submenu_Entries = 15
+
+In the MRU window, the filenames are displayed in two parts. The first part
+contains the file name without the path and the second part contains the
+full path to the file in parenthesis. This format is controlled by the
+MRU_Filename_Format variable. If you prefer to change this to some other
+format, then you can modify the MRU_Filename_Format variable. For example,
+to display the full path without splitting it, you can set this variable
+as shown below:
+
+      let MRU_Filename_Format={'formatter':'v:val', 'parser':'.*'}
+
diff --git a/sources_non_forked/mru.vim/plugin/mru.vim b/sources_non_forked/mru.vim/plugin/mru.vim
new file mode 100644
index 00000000..5cf7015d
--- /dev/null
+++ b/sources_non_forked/mru.vim/plugin/mru.vim
@@ -0,0 +1,1039 @@
+" File: mru.vim
+" Author: Yegappan Lakshmanan (yegappan AT yahoo DOT com)
+" Version: 3.9
+" Last Modified: Feb 3, 2015
+" Copyright: Copyright (C) 2003-2015 Yegappan Lakshmanan
+" License:   Permission is hereby granted to use and distribute this code,
+"            with or without modifications, provided that this copyright
+"            notice is copied with it. Like anything else that's free,
+"            mru.vim is provided *as is* and comes with no warranty of any
+"            kind, either expressed or implied. In no event will the copyright
+"            holder be liable for any damages resulting from the use of this
+"            software.
+"
+" Overview
+" --------
+" The Most Recently Used (MRU) plugin provides an easy access to a list of
+" recently opened/edited files in Vim. This plugin automatically stores the
+" file names as you open/edit them in Vim.
+"
+" This plugin will work on all the platforms where Vim is supported. This
+" plugin will work in both console and GUI Vim. This version of the MRU
+" plugin needs Vim 7.0 and above. If you are using an earlier version of
+" Vim, then you should use an older version of the MRU plugin.
+"
+" The recently used filenames are stored in a file specified by the Vim
+" MRU_File variable.
+"
+" The Github repository for the MRU plugin is available at:
+"
+"	http://github.com/yegappan/mru
+"
+" Installation
+" ------------
+" 1. Copy the mru.vim file to one of the following directories:
+"       $HOME/.vim/plugin     - Unix like systems
+"       $HOME/vimfiles/plugin - MS-Windows
+"       $VIM:vimfiles:plugin  - Macintosh
+"       $VIM/vimfiles/plugin  - All
+" 2. Restart Vim.
+" 3. You can use the ":MRU" command to list and edit the recently used files.
+"    In GUI Vim, you can use the 'File->Recent Files' menu to access the
+"    recently used files.
+"
+" To uninstall this plugin, remove this file (mru.vim) from the
+" $HOME/.vim/plugin or $HOME/vimfiles/plugin or the $VIM/vimfile/plugin
+" directory.
+"
+" Usage
+" -----
+" To list and edit files from the MRU list, you can use the ":MRU" command.
+" The ":MRU" command displays the MRU file list in a temporary Vim window.  If
+" the MRU window is already opened, then the MRU list displayed in the window
+" is refreshed.
+"
+" If you are using GUI Vim, then the names of the recently edited files are
+" added to the "File->Recent Files" menu. You can select the name of a file
+" from this sub-menu to edit the file.
+"
+" You can use the normal Vim commands to move around in the MRU window. You
+" cannot make changes in the MRU window.
+"
+" You can select a file name to edit by pressing the <Enter> key or by double
+" clicking the left mouse button on a file name.  The selected file will be
+" opened. If the file is already opened in a window, the cursor will be moved
+" to that window. Otherwise, the file is opened in the previous window. If the
+" previous window has a modified buffer or is the preview window or is used by
+" some other plugin, then the file is opened in a new window.
+"
+" You can press the 'o' key to open the file name under the cursor in the
+" MRU window in a new window. You can also press <Shift-Enter> instead of 'o'
+" to open the file in a new window.
+"
+" To open a file from the MRU window in read-only mode (view), press the 'v'
+" key.
+"
+" To open a file from the MRU window in a new tab, press the 't' key.  If the
+" file is already opened in a window in the current or in another tab, then
+" the cursor is moved to that tab. Otherwise, a new tab is opened.
+"
+" You can open multiple files from the MRU window by specifying a count before
+" pressing '<Enter>' or 'v' or 'o' or 't'. You can also visually (using
+" linewise visual mode) select multiple filenames and invoke the commands to
+" open the files. Each selected file will be opened in a separate window or
+" tab.
+"
+" You can press the 'u' key in the MRU window to update the file list. This is
+" useful if you keep the MRU window open always.
+"
+" You can close the MRU window by pressing the 'q' key or the <Esc> key or
+" using one of the Vim window commands.
+"
+" To display only files matching a pattern from the MRU list in the MRU
+" window, you can specify a pattern to the ":MRU" command. For example, to
+" display only file names matching "vim" in them, you can use the following
+" command ":MRU vim".  When you specify a partial file name and only one
+" matching filename is found, then the ":MRU" command will edit that file.
+"
+" The ":MRU" command supports command-line completion of file names from
+" the MRU list. You can enter a partial file name and then press <Tab>
+" or <Ctrl-D> to complete or list all the matching file names. Note that
+" after typing the ":MRU" command, you have to enter a space before completing
+" the file names with <Tab>.
+"
+" When a file supplied to the ":MRU" command is not present in the MRU list,
+" but it is a readable file, then the file will be opened (even though it is
+" not present in the MRU list). This is useful if you want to open a file
+" present in the same directory as a file in the MRU list. You can use the
+" command-line completion of the ":MRU" command to complete the full path of a
+" file and then modify the path to open another file present in the same path.
+"
+" Whenever the MRU list changes, the MRU file is updated with the latest MRU
+" list. When you have multiple instances of Vim running at the same time, the
+" latest MRU list will show up in all the instances of Vim.
+"
+" The MRUFilename syntax group is used to highlight the file names in the MRU
+" window. By default, this syntax group is linked to the Identifier highlight
+" group. You can change the highlight group by adding the following line in
+" your .vimrc:
+"
+"    highlight link MRUFileName LineNr
+"
+" The MRU buffer uses the 'mru file type. You can use this file type to add
+" custom auto commands, syntax highlighting, etc.
+"
+" Configuration
+" -------------
+" By changing the following variables you can configure the behavior of this
+" plugin. Set the following variables in your .vimrc file using the 'let'
+" command.
+"
+" The list of recently edited file names is stored in the file specified by the
+" MRU_File variable.  The default setting for this variable is
+" $HOME/.vim_mru_files for Unix-like systems and $USERPROFILE/_vim_mru_files
+" for MS-Windows systems. You can change this variable to point to a file by
+" adding the following line to the .vimrc file:
+"
+"       let MRU_File = 'd:\myhome\_vim_mru_files'
+"
+" By default, the plugin will remember the names of the last 100 used files.
+" As you edit more files, old file names will be removed from the MRU list.
+" You can set the 'MRU_Max_Entries' variable to remember more file names. For
+" example, to remember 1000 most recently used file names, you can use
+"
+"       let MRU_Max_Entries = 1000
+"
+" By default, all the edited file names will be added to the MRU list. If you
+" want to exclude file names matching a list of patterns, you can set the
+" MRU_Exclude_Files variable to a list of Vim regular expressions. By default,
+" this variable is set to an empty string. For example, to not include files
+" in the temporary (/tmp, /var/tmp and d:\temp) directories, you can set the
+" MRU_Exclude_Files variable to
+"
+"       let MRU_Exclude_Files = '^/tmp/.*\|^/var/tmp/.*'  " For Unix
+"       let MRU_Exclude_Files = '^c:\\temp\\.*'           " For MS-Windows
+" 
+" The specified pattern should be a Vim regular expression pattern.
+"
+" If you want to add only file names matching a set of patterns to the MRU
+" list, then you can set the MRU_Include_Files variable. This variable should
+" be set to a Vim regular expression pattern. For example, to add only .c and
+" .h files to the MRU list, you can set this variable as below:
+"
+"       let MRU_Include_Files = '\.c$\|\.h$'
+"
+" By default, MRU_Include_Files is set to an empty string and all the edited
+" filenames are added to the MRU list.
+"
+" The default height of the MRU window is 8. You can set the MRU_Window_Height
+" variable to change the window height.
+"
+"       let MRU_Window_Height = 15
+"
+" By default, when the :MRU command is invoked, the MRU list will be displayed
+" in a new window. Instead, if you want the MRU plugin to reuse the current
+" window, then you can set the 'MRU_Use_Current_Window' variable to one.
+"
+"       let MRU_Use_Current_Window = 1
+"
+" The MRU plugin will reuse the current window. When a file name is selected,
+" the file is also opened in the current window.
+"
+" When you select a file from the MRU window, the MRU window will be
+" automatically closed and the selected file will be opened in the previous
+" window. You can set the 'MRU_Auto_Close' variable to zero to keep the MRU
+" window open.
+"
+"       let MRU_Auto_Close = 0
+"
+" If you don't use the "File->Recent Files" menu and want to disable it,
+" then you can set the 'MRU_Add_Menu' variable to zero. By default, the
+" menu is enabled.
+"
+"       let MRU_Add_Menu = 0
+"
+" If too many file names are present in the MRU list, then updating the MRU
+" menu to list all the file names makes Vim slow. To avoid this, the
+" MRU_Max_Menu_Entries variable controls the number of file names to show in
+" the MRU menu. By default, this is set to 10. You can change this to show
+" more entries in the menu.
+"
+"       let MRU_Max_Menu_Entries = 20
+"
+" If many file names are present in the MRU list, then the MRU menu is split
+" into sub-menus. Each sub-menu contains MRU_Max_Submenu_Entries file names.
+" The default setting for this is 10. You can change this to increase the
+" number of file names displayed in a single sub-menu:
+"
+"       let MRU_Max_Submenu_Entries = 15
+"
+" In the MRU window, the filenames are displayed in two parts. The first part
+" contains the file name without the path and the second part contains the
+" full path to the file in parenthesis. This format is controlled by the
+" MRU_Filename_Format variable. If you prefer to change this to some other
+" format, then you can modify the MRU_Filename_Format variable. For example,
+" to display the full path without splitting it, you can set this variable
+" as shown below:
+"
+"       let MRU_Filename_Format =
+"       \   {'formatter':'v:val', 'parser':'.*', 'syntax': '[^/\\]\+$'}
+"
+" ****************** Do not modify after this line ************************
+if exists('loaded_mru')
+    finish
+endif
+let loaded_mru=1
+
+if v:version < 700
+    finish
+endif
+
+" Line continuation used here
+let s:cpo_save = &cpo
+set cpo&vim
+
+" MRU configuration variables {{{1
+" Maximum number of entries allowed in the MRU list
+if !exists('MRU_Max_Entries')
+    let MRU_Max_Entries = 100
+endif
+
+" Files to exclude from the MRU list
+if !exists('MRU_Exclude_Files')
+    let MRU_Exclude_Files = ''
+endif
+
+" Files to include in the MRU list
+if !exists('MRU_Include_Files')
+    let MRU_Include_Files = ''
+endif
+
+" Height of the MRU window
+" Default height is 8
+if !exists('MRU_Window_Height')
+    let MRU_Window_Height = 8
+endif
+
+if !exists('MRU_Use_Current_Window')
+    let MRU_Use_Current_Window = 0
+endif
+
+if !exists('MRU_Auto_Close')
+    let MRU_Auto_Close = 1
+endif
+
+if !exists('MRU_File')
+    if has('unix') || has('macunix')
+        let MRU_File = $HOME . '/.vim_mru_files'
+    else
+        let MRU_File = $VIM . '/_vim_mru_files'
+        if has('win32')
+            " MS-Windows
+            if $USERPROFILE != ''
+                let MRU_File = $USERPROFILE . '\_vim_mru_files'
+            endif
+        endif
+    endif
+endif
+
+" Option for enabling or disabling the MRU menu
+if !exists('MRU_Add_Menu')
+    let MRU_Add_Menu = 1
+endif
+
+" Maximum number of file names to show in the MRU menu. If too many files are
+" listed in the menu, then Vim becomes slow when updating the menu. So set
+" this to a low value.
+if !exists('MRU_Max_Menu_Entries')
+    let MRU_Max_Menu_Entries = 10
+endif
+
+" Maximum number of file names to show in a MRU sub-menu. If the MRU list
+" contains more file names than this setting, then the MRU menu is split into
+" one or more sub-menus.
+if !exists('MRU_Max_Submenu_Entries')
+    let MRU_Max_Submenu_Entries = 10
+endif
+
+" When only a single matching filename is found in the MRU list, the following
+" option controls whether the file name is displayed in the MRU window or the
+" file is directly opened. When this variable is set to 0 and a single
+" matching file name is found, then the file is directly opened.
+if !exists('MRU_Window_Open_Always')
+    let MRU_Window_Open_Always = 0
+endif
+
+" When opening a file from the MRU list, the file is opened in the current
+" tab. If the selected file has to be opened in a tab always, then set the
+" following variable to 1. If the file is already opened in a tab, then the
+" cursor will be moved to that tab.
+if !exists('MRU_Open_File_Use_Tabs')
+    let MRU_Open_File_Use_Tabs = 0
+endif
+
+" Format of the file names displayed in the MRU window.
+" The default is to display the filename followed by the complete path to the
+" file in parenthesis. This variable controls the expressions used to format
+" and parse the path. This can be changed to display the filenames in a
+" different format. The 'formatter' specifies how to split/format the filename
+" and 'parser' specifies how to read the filename back; 'syntax' matches the
+" part to be highlighted.
+if !exists('MRU_Filename_Format')
+    let MRU_Filename_Format = {
+        \   'formatter': 'fnamemodify(v:val, ":t") . " (" . v:val . ")"',
+        \   'parser': '(\zs.*\ze)',
+        \   'syntax': '^.\{-}\ze('
+        \}
+endif
+
+" Control to temporarily lock the MRU list. Used to prevent files from
+" getting added to the MRU list when the ':vimgrep' command is executed.
+let s:mru_list_locked = 0
+
+" MRU_LoadList                          {{{1
+" Loads the latest list of file names from the MRU file
+function! s:MRU_LoadList()
+    " If the MRU file is present, then load the list of filenames. Otherwise
+    " start with an empty list.
+    if filereadable(g:MRU_File)
+        let s:MRU_files = readfile(g:MRU_File)
+        if s:MRU_files[0] =~# '^\s*" Most recently edited files in Vim'
+            " Generated by the previous version of the MRU plugin.
+            " Discard the list.
+            let s:MRU_files = []
+        elseif s:MRU_files[0] =~# '^#'
+            " Remove the comment line
+            call remove(s:MRU_files, 0)
+        else
+            " Unsupported format
+            let s:MRU_files = []
+        endif
+    else
+        let s:MRU_files = []
+    endif
+
+    " Refresh the MRU menu with the latest list of filenames
+    call s:MRU_Refresh_Menu()
+endfunction
+
+" MRU_SaveList                          {{{1
+" Saves the MRU file names to the MRU file
+function! s:MRU_SaveList()
+    let l = []
+    call add(l, '# Most recently edited files in Vim (version 3.0)')
+    call extend(l, s:MRU_files)
+    call writefile(l, g:MRU_File)
+endfunction
+
+" MRU_AddFile                           {{{1
+" Adds a file to the MRU file list
+"   acmd_bufnr - Buffer number of the file to add
+function! s:MRU_AddFile(acmd_bufnr)
+    if s:mru_list_locked
+        " MRU list is currently locked
+        return
+    endif
+
+    " Get the full path to the filename
+    let fname = fnamemodify(bufname(a:acmd_bufnr + 0), ':p')
+    if fname == ''
+        return
+    endif
+
+    " Skip temporary buffers with buftype set. The buftype is set for buffers
+    " used by plugins.
+    if &buftype != ''
+        return
+    endif
+
+    if g:MRU_Include_Files != ''
+        " If MRU_Include_Files is set, include only files matching the
+        " specified pattern
+        if fname !~# g:MRU_Include_Files
+            return
+        endif
+    endif
+
+    if g:MRU_Exclude_Files != ''
+        " Do not add files matching the pattern specified in the
+        " MRU_Exclude_Files to the MRU list
+        if fname =~# g:MRU_Exclude_Files
+            return
+        endif
+    endif
+
+    " If the filename is not already present in the MRU list and is not
+    " readable then ignore it
+    let idx = index(s:MRU_files, fname)
+    if idx == -1
+        if !filereadable(fname)
+            " File is not readable and is not in the MRU list
+            return
+        endif
+    endif
+
+    " Load the latest MRU file list
+    call s:MRU_LoadList()
+
+    " Remove the new file name from the existing MRU list (if already present)
+    call filter(s:MRU_files, 'v:val !=# fname')
+
+    " Add the new file list to the beginning of the updated old file list
+    call insert(s:MRU_files, fname, 0)
+
+    " Trim the list
+    if len(s:MRU_files) > g:MRU_Max_Entries
+        call remove(s:MRU_files, g:MRU_Max_Entries, -1)
+    endif
+
+    " Save the updated MRU list
+    call s:MRU_SaveList()
+
+    " Refresh the MRU menu
+    call s:MRU_Refresh_Menu()
+
+    " If the MRU window is open, update the displayed MRU list
+    let bname = '__MRU_Files__'
+    let winnum = bufwinnr(bname)
+    if winnum != -1
+        let cur_winnr = winnr()
+        call s:MRU_Open_Window()
+        if winnr() != cur_winnr
+            exe cur_winnr . 'wincmd w'
+        endif
+    endif
+endfunction
+
+" MRU_escape_filename                   {{{1
+" Escape special characters in a filename. Special characters in file names
+" that should be escaped (for security reasons)
+let s:esc_filename_chars = ' *?[{`$%#"|!<>();&' . "'\t\n"
+function! s:MRU_escape_filename(fname)
+    if exists("*fnameescape")
+        return fnameescape(a:fname)
+    else
+        return escape(a:fname, s:esc_filename_chars)
+    endif
+endfunction
+
+" MRU_Edit_File                         {{{1
+" Edit the specified file
+"   filename - Name of the file to edit
+"   sanitized - Specifies whether the filename is already escaped for special
+"   characters or not.
+function! s:MRU_Edit_File(filename, sanitized)
+    if !a:sanitized
+	let esc_fname = s:MRU_escape_filename(a:filename)
+    else
+	let esc_fname = a:filename
+    endif
+
+    " If the user wants to always open the file in a tab, then open the file
+    " in a tab. If it is already opened in a tab, then the cursor will be
+    " moved to that tab.
+    if g:MRU_Open_File_Use_Tabs
+	call s:MRU_Open_File_In_Tab(a:filename, esc_fname)
+	return
+    endif
+
+    " If the file is already open in one of the windows, jump to it
+    let winnum = bufwinnr('^' . a:filename . '$')
+    if winnum != -1
+        if winnum != winnr()
+            exe winnum . 'wincmd w'
+        endif
+    else
+        if !&hidden && (&modified || &buftype != '' || &previewwindow)
+            " Current buffer has unsaved changes or is a special buffer or is
+            " the preview window.  The 'hidden' option is also not set.
+            " So open the file in a new window.
+            exe 'split ' . esc_fname
+        else
+            " The current file can be replaced with the selected file.
+            exe 'edit ' . esc_fname
+        endif
+    endif
+endfunction
+
+" MRU_Open_File_In_Tab
+" Open a file in a tab. If the file is already opened in a tab, jump to the
+" tab. Otherwise, create a new tab and open the file.
+"   fname     : Name of the file to open
+"   esc_fname : File name with special characters escaped
+function! s:MRU_Open_File_In_Tab(fname, esc_fname)
+    " If the selected file is already open in the current tab or in
+    " another tab, jump to it. Otherwise open it in a new tab
+    if bufwinnr('^' . a:fname . '$') == -1
+	let tabnum = -1
+	let i = 1
+	let bnum = bufnr('^' . a:fname . '$')
+	while i <= tabpagenr('$')
+	    if index(tabpagebuflist(i), bnum) != -1
+		let tabnum = i
+		break
+	    endif
+	    let i += 1
+	endwhile
+
+	if tabnum != -1
+	    " Goto the tab containing the file
+	    exe 'tabnext ' . i
+	else
+	    " Open a new tab as the last tab page
+	    exe '$tabnew ' . a:esc_fname
+	endif
+    endif
+
+    " Jump to the window containing the file
+    let winnum = bufwinnr('^' . a:fname . '$')
+    if winnum != winnr()
+	exe winnum . 'wincmd w'
+    endif
+endfunction
+
+" MRU_Window_Edit_File                  {{{1
+"   fname     : Name of the file to edit. May specify single or multiple
+"               files.
+"   edit_type : Specifies how to edit the file. Can be one of 'edit' or 'view'.
+"               'view' - Open the file as a read-only file
+"               'edit' - Edit the file as a regular file
+"   multi     : Specifies  whether a single file or multiple files need to be
+"               opened.
+"   open_type : Specifies where to open the file.
+"               useopen - If the file is already present in a window, then
+"                         jump to that window.  Otherwise, open the file in
+"                         the previous window.
+"               newwin_horiz - Open the file in a new horizontal window.
+"               newwin_vert - Open the file in a new vertical window.
+"               newtab  - Open the file in a new tab. If the file is already
+"                         opened in a tab, then jump to that tab.
+"               preview - Open the file in the preview window
+function! s:MRU_Window_Edit_File(fname, multi, edit_type, open_type)
+    let esc_fname = s:MRU_escape_filename(a:fname)
+
+    if a:open_type ==# 'newwin_horiz'
+        " Edit the file in a new horizontally split window above the previous
+        " window
+        wincmd p
+        exe 'belowright new ' . esc_fname
+    elseif a:open_type ==# 'newwin_vert'
+        " Edit the file in a new vertically split window above the previous
+        " window
+        wincmd p
+        exe 'belowright vnew ' . esc_fname
+    elseif a:open_type ==# 'newtab' || g:MRU_Open_File_Use_Tabs
+	call s:MRU_Open_File_In_Tab(a:fname, esc_fname)
+    elseif a:open_type ==# 'preview'
+        " Edit the file in the preview window
+        exe 'topleft pedit ' . esc_fname
+    else
+        " If the selected file is already open in one of the windows,
+        " jump to it
+        let winnum = bufwinnr('^' . a:fname . '$')
+        if winnum != -1
+            exe winnum . 'wincmd w'
+        else
+            if g:MRU_Auto_Close == 1 && g:MRU_Use_Current_Window == 0
+                " Jump to the window from which the MRU window was opened
+                if exists('s:MRU_last_buffer')
+                    let last_winnr = bufwinnr(s:MRU_last_buffer)
+                    if last_winnr != -1 && last_winnr != winnr()
+                        exe last_winnr . 'wincmd w'
+                    endif
+                endif
+            else
+                if g:MRU_Use_Current_Window == 0
+                    " Goto the previous window
+                    " If MRU_Use_Current_Window is set to one, then the
+                    " current window is used to open the file
+                    wincmd p
+                endif
+            endif
+
+            let split_window = 0
+
+            if (!&hidden && (&modified || &previewwindow)) || a:multi
+                " Current buffer has unsaved changes or is the preview window
+                " or the user is opening multiple files
+                " So open the file in a new window
+                let split_window = 1
+            endif
+
+            if &buftype != ''
+                " Current buffer is a special buffer (maybe used by a plugin)
+                if g:MRU_Use_Current_Window == 0 ||
+                            \ bufnr('%') != bufnr('__MRU_Files__')
+                    let split_window = 1
+                endif
+            endif
+
+            " Edit the file
+            if split_window
+                " Current buffer has unsaved changes or is a special buffer or
+                " is the preview window.  So open the file in a new window
+                if a:edit_type ==# 'edit'
+                    exe 'split ' . esc_fname
+                else
+                    exe 'sview ' . esc_fname
+                endif
+            else
+                if a:edit_type ==# 'edit'
+                    exe 'edit ' . esc_fname
+                else
+                    exe 'view ' . esc_fname
+                endif
+            endif
+        endif
+    endif
+endfunction
+
+" MRU_Select_File_Cmd                   {{{1
+" Open a file selected from the MRU window
+"
+"   'opt' has two values separated by comma. The first value specifies how to
+"   edit the file  and can be either 'edit' or 'view'. The second value
+"   specifies where to open the file. It can take one of the following values:
+"     'useopen' to open file in the previous window
+"     'newwin_horiz' to open the file in a new horizontal split window
+"     'newwin_vert' to open the file in a new vertical split window.
+"     'newtab' to open the file in a new tab.
+" If multiple file names are selected using visual mode, then open multiple
+" files (either in split windows or tabs)
+function! s:MRU_Select_File_Cmd(opt) range
+    let [edit_type, open_type] = split(a:opt, ',')
+
+    let fnames = getline(a:firstline, a:lastline)
+
+    if g:MRU_Auto_Close == 1 && g:MRU_Use_Current_Window == 0
+        " Automatically close the window if the file window is
+        " not used to display the MRU list.
+        silent! close
+    endif
+
+    let multi = 0
+
+    for f in fnames
+        if f == ''
+            continue
+        endif
+
+        " The text in the MRU window contains the filename in parenthesis
+        let file = matchstr(f, g:MRU_Filename_Format.parser)
+
+        call s:MRU_Window_Edit_File(file, multi, edit_type, open_type)
+
+        if a:firstline != a:lastline
+            " Opening multiple files
+            let multi = 1
+        endif
+    endfor
+endfunction
+
+" MRU_Warn_Msg                          {{{1
+" Display a warning message
+function! s:MRU_Warn_Msg(msg)
+    echohl WarningMsg
+    echo a:msg
+    echohl None
+endfunction
+
+" MRU_Open_Window                       {{{1
+" Display the Most Recently Used file list in a temporary window.
+" If the optional argument is supplied, then it specifies the pattern of files
+" to selectively display in the MRU window.
+function! s:MRU_Open_Window(...)
+
+    " Load the latest MRU file list
+    call s:MRU_LoadList()
+
+    " Check for empty MRU list
+    if empty(s:MRU_files)
+        call s:MRU_Warn_Msg('MRU file list is empty')
+        return
+    endif
+
+    " Save the current buffer number. This is used later to open a file when a
+    " entry is selected from the MRU window. The window number is not saved,
+    " as the window number will change when new windows are opened.
+    let s:MRU_last_buffer = bufnr('%')
+
+    let bname = '__MRU_Files__'
+
+    " If the window is already open, jump to it
+    let winnum = bufwinnr(bname)
+    if winnum != -1
+        if winnr() != winnum
+            " If not already in the window, jump to it
+            exe winnum . 'wincmd w'
+        endif
+
+        setlocal modifiable
+
+        " Delete the contents of the buffer to the black-hole register
+        silent! %delete _
+    else
+        if g:MRU_Use_Current_Window
+            " Reuse the current window
+            "
+            " If the __MRU_Files__ buffer exists, then reuse it. Otherwise open
+            " a new buffer
+            let bufnum = bufnr(bname)
+            if bufnum == -1
+                let cmd = 'edit ' . bname
+            else
+                let cmd = 'buffer ' . bufnum
+            endif
+
+            exe cmd
+
+            if bufnr('%') != bufnr(bname)
+                " Failed to edit the MRU buffer
+                return
+            endif
+        else
+            " Open a new window at the bottom
+
+            " If the __MRU_Files__ buffer exists, then reuse it. Otherwise open
+            " a new buffer
+            let bufnum = bufnr(bname)
+            if bufnum == -1
+                let wcmd = bname
+            else
+                let wcmd = '+buffer' . bufnum
+            endif
+
+            exe 'silent! botright ' . g:MRU_Window_Height . 'split ' . wcmd
+        endif
+    endif
+
+    setlocal modifiable
+
+    " Mark the buffer as scratch
+    setlocal buftype=nofile
+    setlocal bufhidden=delete
+    setlocal noswapfile
+    setlocal nowrap
+    setlocal nobuflisted
+    " Set the 'filetype' to 'mru'. This allows the user to apply custom
+    " syntax highlighting or other changes to the MRU bufer.
+    setlocal filetype=mru
+    " Use fixed height for the MRU window
+    setlocal winfixheight
+
+    " Setup the cpoptions properly for the maps to work
+    let old_cpoptions = &cpoptions
+    set cpoptions&vim
+
+    " Create mappings to select and edit a file from the MRU list
+    nnoremap <buffer> <silent> <CR>
+                \ :call <SID>MRU_Select_File_Cmd('edit,useopen')<CR>
+    vnoremap <buffer> <silent> <CR>
+                \ :call <SID>MRU_Select_File_Cmd('edit,useopen')<CR>
+    nnoremap <buffer> <silent> o
+                \ :call <SID>MRU_Select_File_Cmd('edit,newwin_horiz')<CR>
+    vnoremap <buffer> <silent> o
+                \ :call <SID>MRU_Select_File_Cmd('edit,newwin_horiz')<CR>
+    nnoremap <buffer> <silent> <S-CR>
+                \ :call <SID>MRU_Select_File_Cmd('edit,newwin_horiz')<CR>
+    vnoremap <buffer> <silent> <S-CR>
+                \ :call <SID>MRU_Select_File_Cmd('edit,newwin_horiz')<CR>
+    nnoremap <buffer> <silent> O
+                \ :call <SID>MRU_Select_File_Cmd('edit,newwin_vert')<CR>
+    vnoremap <buffer> <silent> O
+                \ :call <SID>MRU_Select_File_Cmd('edit,newwin_vert')<CR>
+    nnoremap <buffer> <silent> t
+                \ :call <SID>MRU_Select_File_Cmd('edit,newtab')<CR>
+    vnoremap <buffer> <silent> t
+                \ :call <SID>MRU_Select_File_Cmd('edit,newtab')<CR>
+    nnoremap <buffer> <silent> v
+                \ :call <SID>MRU_Select_File_Cmd('view,useopen')<CR>
+    nnoremap <buffer> <silent> p
+                \ :call <SID>MRU_Select_File_Cmd('view,preview')<CR>
+    vnoremap <buffer> <silent> p
+                \ :<C-u>if line("'<") == line("'>")<Bar>
+                \     call <SID>MRU_Select_File_Cmd('open,preview')<Bar>
+                \ else<Bar>
+                \     echoerr "Only a single file can be previewed"<Bar>
+                \ endif<CR>
+    nnoremap <buffer> <silent> u :MRU<CR>
+    nnoremap <buffer> <silent> <2-LeftMouse>
+                \ :call <SID>MRU_Select_File_Cmd('edit,useopen')<CR>
+    nnoremap <buffer> <silent> q :close<CR>
+
+    " Restore the previous cpoptions settings
+    let &cpoptions = old_cpoptions
+
+    " Display the MRU list
+    if a:0 == 0
+        " No search pattern specified. Display the complete list
+        let m = copy(s:MRU_files)
+    else
+        " Display only the entries matching the specified pattern
+	" First try using it as a literal pattern
+	let m = filter(copy(s:MRU_files), 'stridx(v:val, a:1) != -1')
+	if len(m) == 0
+	    " No match. Try using it as a regular expression
+	    let m = filter(copy(s:MRU_files), 'v:val =~# a:1')
+	endif
+    endif
+
+    " Get the tail part of the file name (without the directory) and display
+    " it along with the full path in parenthesis.
+    let  output = map(m, g:MRU_Filename_Format.formatter)
+    silent! 0put =output
+
+    " Delete the empty line at the end of the buffer
+    silent! $delete _
+
+    " Move the cursor to the beginning of the file
+    normal! gg
+
+    " Add syntax highlighting for the file names
+    if has_key(g:MRU_Filename_Format, 'syntax')
+        exe "syntax match MRUFileName '" . g:MRU_Filename_Format.syntax . "'"
+        highlight default link MRUFileName Identifier
+    endif
+
+    setlocal nomodifiable
+endfunction
+
+" MRU_Complete                          {{{1
+" Command-line completion function used by :MRU command
+function! s:MRU_Complete(ArgLead, CmdLine, CursorPos)
+    if a:ArgLead == ''
+        " Return the complete list of MRU files
+        return s:MRU_files
+    else
+        " Return only the files matching the specified pattern
+        return filter(copy(s:MRU_files), 'v:val =~? a:ArgLead')
+    endif
+endfunction
+
+" MRU_Cmd                               {{{1
+" Function to handle the MRU command
+"   pat - File name pattern passed to the MRU command
+function! s:MRU_Cmd(pat)
+    if a:pat == ''
+        " No arguments specified. Open the MRU window
+        call s:MRU_Open_Window()
+        return
+    endif
+
+    " Load the latest MRU file
+    call s:MRU_LoadList()
+
+    " Empty MRU list
+    if empty(s:MRU_files)
+        call s:MRU_Warn_Msg('MRU file list is empty')
+        return
+    endif
+
+    " First use the specified string as a literal string and search for
+    " filenames containing the string. If only one filename is found,
+    " then edit it (unless the user wants to open the MRU window always)
+    let m = filter(copy(s:MRU_files), 'stridx(v:val, a:pat) != -1')
+    if len(m) > 0
+	if len(m) == 1 && !g:MRU_Window_Open_Always
+	    call s:MRU_Edit_File(m[0], 0)
+	    return
+	endif
+
+	" More than one file matches. Try find an accurate match
+	let new_m = filter(m, 'v:val ==# a:pat')
+	if len(new_m) == 1 && !g:MRU_Window_Open_Always
+	    call s:MRU_Edit_File(new_m[0], 0)
+	    return
+	endif
+
+	" Couldn't find an exact match, open the MRU window with all the
+        " files matching the pattern.
+	call s:MRU_Open_Window(a:pat)
+	return
+    endif
+
+    " Use the specified string as a regular expression pattern and search
+    " for filenames matching the pattern
+    let m = filter(copy(s:MRU_files), 'v:val =~? a:pat')
+
+    if len(m) == 0
+        " If an existing file (not present in the MRU list) is specified,
+        " then open the file.
+        if filereadable(a:pat)
+            call s:MRU_Edit_File(a:pat, 0)
+            return
+        endif
+
+        " No filenames matching the specified pattern are found
+        call s:MRU_Warn_Msg("MRU file list doesn't contain " .
+                    \ "files matching " . a:pat)
+        return
+    endif
+
+    if len(m) == 1 && !g:MRU_Window_Open_Always
+        call s:MRU_Edit_File(m[0], 0)
+        return
+    endif
+
+    call s:MRU_Open_Window(a:pat)
+endfunction
+
+" MRU_add_files_to_menu                 {{{1
+" Adds a list of files to the "Recent Files" sub menu under the "File" menu.
+"   prefix - Prefix to use for each of the menu entries
+"   file_list - List of file names to add to the menu
+function! s:MRU_add_files_to_menu(prefix, file_list)
+    for fname in a:file_list
+        " Escape special characters in the filename
+        let esc_fname = escape(fnamemodify(fname, ':t'), ".\\" .
+                                        \ s:esc_filename_chars)
+        let esc_fname = substitute(esc_fname, '&', '&&', 'g')
+
+        " Truncate the directory name if it is long
+        let dir_name = fnamemodify(fname, ':h')
+        let len = strlen(dir_name)
+        " Shorten long file names by adding only few characters from
+        " the beginning and end.
+        if len > 30
+            let dir_name = strpart(dir_name, 0, 10) .
+                        \ '...' . 
+                        \ strpart(dir_name, len - 20)
+        endif
+        let esc_dir_name = escape(dir_name, ".\\" . s:esc_filename_chars)
+        let esc_dir_name = substitute(esc_dir_name, '&', '&&', 'g')
+
+	let menu_path = '&File.&Recent\ Files.' . a:prefix . esc_fname .
+		    \ '\ (' . esc_dir_name . ')'
+	let esc_mfname = s:MRU_escape_filename(fname)
+        exe 'anoremenu <silent> ' . menu_path .
+                    \ " :call <SID>MRU_Edit_File('" . esc_mfname . "', 1)<CR>"
+	exe 'tmenu ' . menu_path . ' Edit file ' . esc_mfname
+    endfor
+endfunction
+
+" MRU_Refresh_Menu                      {{{1
+" Refresh the MRU menu
+function! s:MRU_Refresh_Menu()
+    if !has('menu') || !g:MRU_Add_Menu
+        " No support for menus
+        return
+    endif
+
+    " Setup the cpoptions properly for the maps to work
+    let old_cpoptions = &cpoptions
+    set cpoptions&vim
+
+    " Remove the MRU menu
+    " To retain the teared-off MRU menu, we need to add a dummy entry
+    silent! unmenu &File.&Recent\ Files
+    " The menu priority of the File menu is 10. If the MRU plugin runs
+    " first before menu.vim, the File menu order may not be correct.
+    " So specify the priority of the File menu here.
+    10noremenu &File.&Recent\ Files.Dummy <Nop>
+    silent! unmenu! &File.&Recent\ Files
+
+    anoremenu <silent> &File.&Recent\ Files.Refresh\ list
+                \ :call <SID>MRU_LoadList()<CR>
+    exe 'tmenu File.&Recent\ Files.Refresh\ list Reload the MRU file list from '
+		\ . s:MRU_escape_filename(g:MRU_File)
+    anoremenu File.&Recent\ Files.-SEP1-           :
+
+    " Add the filenames in the MRU list to the menu
+    let entry_cnt = len(s:MRU_files)
+    if entry_cnt > g:MRU_Max_Menu_Entries
+        " Show only MRU_Max_Menu_Entries file names in the menu
+        let mru_list = s:MRU_files[0 : g:MRU_Max_Menu_Entries - 1]
+        let entry_cnt = g:MRU_Max_Menu_Entries
+    else
+        let mru_list = s:MRU_files
+    endif
+    if entry_cnt > g:MRU_Max_Submenu_Entries
+	" Split the MRU menu into sub-menus
+        for start_idx in range(0, entry_cnt, g:MRU_Max_Submenu_Entries)
+            let last_idx = start_idx + g:MRU_Max_Submenu_Entries - 1
+            if last_idx >= entry_cnt
+                let last_idx = entry_cnt - 1
+            endif
+            let prefix = 'Files\ (' . (start_idx + 1) . '\.\.\.' .
+                        \ (last_idx + 1) . ').'
+            call s:MRU_add_files_to_menu(prefix,
+                        \ mru_list[start_idx : last_idx])
+        endfor
+    else
+        call s:MRU_add_files_to_menu('', mru_list)
+    endif
+
+    " Remove the dummy menu entry
+    unmenu &File.&Recent\ Files.Dummy
+
+    " Restore the previous cpoptions settings
+    let &cpoptions = old_cpoptions
+endfunction
+
+" Load the MRU list on plugin startup
+call s:MRU_LoadList()
+
+" MRU autocommands {{{1
+" Autocommands to detect the most recently used files
+autocmd BufRead * call s:MRU_AddFile(expand('<abuf>'))
+autocmd BufNewFile * call s:MRU_AddFile(expand('<abuf>'))
+autocmd BufWritePost * call s:MRU_AddFile(expand('<abuf>'))
+
+" The ':vimgrep' command adds all the files searched to the buffer list.
+" This also modifies the MRU list, even though the user didn't edit the
+" files. Use the following autocmds to prevent this.
+autocmd QuickFixCmdPre *vimgrep* let s:mru_list_locked = 1
+autocmd QuickFixCmdPost *vimgrep* let s:mru_list_locked = 0
+
+" Command to open the MRU window
+command! -nargs=? -complete=customlist,s:MRU_Complete MRU
+            \ call s:MRU_Cmd(<q-args>)
+command! -nargs=? -complete=customlist,s:MRU_Complete Mru
+            \ call s:MRU_Cmd(<q-args>)
+
+" }}}
+
+" restore 'cpo'
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set foldenable foldmethod=marker:
diff --git a/sources_non_forked/nerdtree/CHANGELOG.md b/sources_non_forked/nerdtree/CHANGELOG.md
index 8b9d83cc..5433836d 100755
--- a/sources_non_forked/nerdtree/CHANGELOG.md
+++ b/sources_non_forked/nerdtree/CHANGELOG.md
@@ -5,6 +5,11 @@
         - **.PATCH**: Pull Request Title (PR Author) [PR Number](Link to PR)
 -->
 #### 6.10
+<<<<<<< HEAD
+=======
+- **.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)
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 - **.7**: Fix mouse-clicking a file to open it. (PhilRunninger) [#1225](https://github.com/preservim/nerdtree/pull/1225)
 - **.6**: Restore the default behavior of the <CR> key. (PhilRunninger) [#1221](https://github.com/preservim/nerdtree/pull/1221)
 - **.5**: Fix `{'keepopen':0}` in NERDTreeCustomOpenArgs (PhilRunninger) [#1217](https://github.com/preservim/nerdtree/pull/1217)
diff --git a/sources_non_forked/nerdtree/autoload/nerdtree.vim b/sources_non_forked/nerdtree/autoload/nerdtree.vim
index e6f687a0..3d424f18 100755
--- a/sources_non_forked/nerdtree/autoload/nerdtree.vim
+++ b/sources_non_forked/nerdtree/autoload/nerdtree.vim
@@ -30,6 +30,7 @@ endfunction
 " SECTION: General Functions {{{1
 "============================================================
 
+<<<<<<< HEAD
 " FUNCTION: nerdtree#closeTreeOnOpen() {{{2
 function! nerdtree#closeTreeOnOpen() abort
     return g:NERDTreeQuitOnOpen == 1 || g:NERDTreeQuitOnOpen == 3
@@ -40,6 +41,30 @@ function! nerdtree#closeBookmarksOnOpen() abort
     return g:NERDTreeQuitOnOpen == 2 || g:NERDTreeQuitOnOpen == 3
 endfunction
 
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+function! nerdtree#slash()
+=======
+"FUNCTION: nerdtree#slash() {{{2
+function! nerdtree#slash() abort
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+
+=======
+=======
+" FUNCTION: nerdtree#closeTreeOnOpen() {{{2
+function! nerdtree#closeTreeOnOpen() abort
+    return g:NERDTreeQuitOnOpen == 1 || g:NERDTreeQuitOnOpen == 3
+endfunction
+
+" FUNCTION: nerdtree#closeBookmarksOnOpen() {{{2
+function! nerdtree#closeBookmarksOnOpen() abort
+    return g:NERDTreeQuitOnOpen == 2 || g:NERDTreeQuitOnOpen == 3
+endfunction
+
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 " FUNCTION: nerdtree#slash() {{{2
 " Return the path separator used by the underlying file system.  Special
 " consideration is taken for the use of the 'shellslash' option on Windows
diff --git a/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim b/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
index c6df0028..0b0ca076 100755
--- a/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
+++ b/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
@@ -108,7 +108,21 @@ function! s:customOpenBookmark(node) abort
 endfunction
 
 "FUNCTION: s:initCustomOpenArgs() {{{1
+<<<<<<< HEAD
 function! s:initCustomOpenArgs() abort
+=======
+<<<<<<< HEAD
+" Make sure NERDTreeCustomOpenArgs has needed keys
+<<<<<<< HEAD
+function! s:initCustomOpenArgs()
+=======
+function! s:initCustomOpenArgs() abort
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+    let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
+    return extend(g:NERDTreeCustomOpenArgs, {'file':{'reuse': 'all', 'where': 'p'}, 'dir':{}}, 'keep')
+=======
+function! s:initCustomOpenArgs() abort
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     let l:defaultOpenArgs = {'file': {'reuse': 'all', 'where': 'p', 'keepopen':!nerdtree#closeTreeOnOpen()}, 'dir': {}}
     try
         let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
@@ -119,6 +133,10 @@ function! s:initCustomOpenArgs() abort
     finally
         return g:NERDTreeCustomOpenArgs
     endtry
+<<<<<<< HEAD
+=======
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 endfunction
 
 "FUNCTION: s:activateAll() {{{1
@@ -572,7 +590,15 @@ endfunction
 
 " FUNCTION: s:previewBookmark(bookmark) {{{1
 function! s:previewBookmark(bookmark) abort
+<<<<<<< HEAD
     call a:bookmark.activate(b:NERDTree, !a:bookmark.path.isDirectory ? {'stay': 1, 'where': 'p', 'keepopen': 1} : {})
+=======
+    if a:bookmark.path.isDirectory
+        execute 'NERDTreeFind '.a:bookmark.path.str()
+    else
+        call a:bookmark.activate(b:NERDTree, {'stay': 1, 'where': 'p', 'keepopen': 1})
+    endif
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 endfunction
 
 "FUNCTION: s:previewNodeCurrent(node) {{{1
diff --git a/sources_non_forked/nerdtree/doc/NERDTree.txt b/sources_non_forked/nerdtree/doc/NERDTree.txt
index 95742a30..6920c657 100755
--- a/sources_non_forked/nerdtree/doc/NERDTree.txt
+++ b/sources_non_forked/nerdtree/doc/NERDTree.txt
@@ -249,7 +249,11 @@ Key      Description                                                  help-tag~
 
 o........Open files, directories and bookmarks......................|NERDTree-o|
 go.......Open selected file, but leave cursor in the NERDTree......|NERDTree-go|
+<<<<<<< HEAD
          Open selected bookmark directory in current NERDTree
+=======
+         Find selected bookmark directory in current NERDTree
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 t........Open selected node/bookmark in a new tab...................|NERDTree-t|
 T........Same as 't' but keep the focus on the current tab..........|NERDTree-T|
 i........Open selected file in a split window.......................|NERDTree-i|
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/key_map.vim b/sources_non_forked/nerdtree/lib/nerdtree/key_map.vim
index e6afb824..ed791677 100755
--- a/sources_non_forked/nerdtree/lib/nerdtree/key_map.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/key_map.vim
@@ -66,11 +66,11 @@ endfunction
 "FUNCTION: KeyMap.invoke() {{{1
 "Call the KeyMaps callback function
 function! s:KeyMap.invoke(...)
-    let Callback = type(self.callback) ==# type(function('tr')) ? self.callback : function(self.callback)
+    let l:Callback = type(self.callback) ==# type(function('tr')) ? self.callback : function(self.callback)
     if a:0
-        call Callback(a:1)
+        call l:Callback(a:1)
     else
-        call Callback()
+        call l:Callback()
     endif
 endfunction
 
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim b/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim
index fc3155d7..ffa2853a 100755
--- a/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim
@@ -15,8 +15,8 @@ function! s:Notifier.NotifyListeners(event, path, nerdtree, params)
     let event = g:NERDTreeEvent.New(a:nerdtree, a:path, a:event, a:params)
 
     for Listener in s:Notifier.GetListenersForEvent(a:event)
-    	let Callback = type(Listener) == type(function('tr')) ? Listener : function(Listener)
-        call Callback(event)
+        let l:Callback = type(Listener) == type(function('tr')) ? Listener : function(Listener)
+        call l:Callback(event)
     endfor
 endfunction
 
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/path.vim b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
index eec4f330..997abf37 100755
--- a/sources_non_forked/nerdtree/lib/nerdtree/path.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
@@ -459,10 +459,10 @@ function! s:Path.ignore(nerdtree)
             endif
         endfor
 
-        for Callback in g:NERDTree.PathFilters()
-            let Callback = type(Callback) ==# type(function('tr')) ? Callback : function(Callback)
-            if Callback({'path': self, 'nerdtree': a:nerdtree})
-                return 1
+        for l:Callback in g:NERDTree.PathFilters()
+            let l:Callback = type(l:Callback) ==# type(function('tr')) ? l:Callback : function(l:Callback)
+            if l:Callback({'path': self, 'nerdtree': a:nerdtree})
+               return 1
             endif
         endfor
     endif
diff --git a/sources_non_forked/nginx.vim/syntax/nginx.vim b/sources_non_forked/nginx.vim/syntax/nginx.vim
index 9d3b92e2..18dd50cb 100755
--- a/sources_non_forked/nginx.vim/syntax/nginx.vim
+++ b/sources_non_forked/nginx.vim/syntax/nginx.vim
@@ -2276,7 +2276,6 @@ hi link ngxComment Comment
 hi link ngxVariable Identifier
 hi link ngxVariableBlock Identifier
 hi link ngxVariableString PreProc
-hi link ngxBlock Normal
 hi link ngxString String
 hi link ngxIPaddr Delimiter
 hi link ngxBoolean Boolean
diff --git a/sources_non_forked/vim-abolish/plugin/abolish.vim b/sources_non_forked/vim-abolish/plugin/abolish.vim
index 6fd332d0..4be1122d 100755
--- a/sources_non_forked/vim-abolish/plugin/abolish.vim
+++ b/sources_non_forked/vim-abolish/plugin/abolish.vim
@@ -284,7 +284,7 @@ function! s:parse_subvert(bang,line1,line2,count,args)
   else
     let args = a:args
   endif
-  let separator = matchstr(args,'^.')
+  let separator = '\v((\\)@<!(\\\\)*\\)@<!' . matchstr(args,'^.')
   let split = split(args,separator,1)[1:]
   if a:count || split == [""]
     return s:parse_substitute(a:bang,a:line1,a:line2,a:count,split)
@@ -399,6 +399,8 @@ function! s:grep_command(args,bang,flags,word)
   let dict = s:create_dictionary(a:word,"",opts)
   if &grepprg == "internal"
     let lhs = "'".s:pattern(dict,opts.boundaries)."'"
+  elseif &grepprg =~# '^rg\|^ag'
+    let lhs = "'".s:egrep_pattern(dict,opts.boundaries)."'"
   else
     let lhs = "-E '".s:egrep_pattern(dict,opts.boundaries)."'"
   endif
diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
index 17c285b7..7dfc96c4 100755
--- a/sources_non_forked/vim-commentary/plugin/commentary.vim
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -50,6 +50,7 @@ function! s:go(...) abort
     let indent = '^\s*'
   endif
 
+  let lines = []
   for lnum in range(lnum1,lnum2)
     let line = getline(lnum)
     if strlen(r) > 2 && l.r !~# '\\'
@@ -62,8 +63,9 @@ function! s:go(...) abort
     else
       let line = substitute(line,'^\%('.matchstr(getline(lnum1),indent).'\|\s*\)\zs.*\S\@<=','\=l.submatch(0).r','')
     endif
-    call setline(lnum,line)
+    call add(lines, line)
   endfor
+  call setline(lnum1, lines)
   let modelines = &modelines
   try
     set modelines=0
diff --git a/sources_non_forked/vim-flake8/autoload/flake8.vim b/sources_non_forked/vim-flake8/autoload/flake8.vim
index 180bcadb..15d061ef 100755
--- a/sources_non_forked/vim-flake8/autoload/flake8.vim
+++ b/sources_non_forked/vim-flake8/autoload/flake8.vim
@@ -273,6 +273,10 @@ function! s:ShowErrorMessage()  " {{{
     if !exists('s:resultDict')
 	return
     endif
+    if !exists('b:showing_message')
+	" ensure showing msg is always defined
+	let b:showing_message = ' '
+    endif
 
     " if there is a message on the current line,
     " then echo it 
@@ -295,4 +299,3 @@ endfunction  " }}}
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
diff --git a/sources_non_forked/vim-fugitive/autoload/fugitive.vim b/sources_non_forked/vim-fugitive/autoload/fugitive.vim
index 94cf8d01..852f9075 100755
--- a/sources_non_forked/vim-fugitive/autoload/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/autoload/fugitive.vim
@@ -6,12 +6,6 @@ if exists('g:autoloaded_fugitive')
 endif
 let g:autoloaded_fugitive = 1
 
-if !exists('g:fugitive_git_executable')
-  let g:fugitive_git_executable = 'git'
-elseif g:fugitive_git_executable =~# '^\w\+='
-  let g:fugitive_git_executable = 'env ' . g:fugitive_git_executable
-endif
-
 " Section: Utility
 
 function! s:function(name) abort
@@ -47,7 +41,7 @@ endfunction
 
 function! s:WinShellEsc(arg) abort
   if type(a:arg) == type([])
-    return join(map(copy(a:arg), 's:shellesc(v:val)'))
+    return join(map(copy(a:arg), 's:WinShellEsc(v:val)'))
   elseif a:arg =~# '^[A-Za-z0-9_/:.-]\+$'
     return a:arg
   else
@@ -82,8 +76,45 @@ function! s:throw(string) abort
   throw 'fugitive: '.a:string
 endfunction
 
+function! s:VersionCheck() abort
+  if v:version < 704
+    return 'return ' . string('echoerr "fugitive: Vim 7.4 or newer required"')
+  elseif empty(fugitive#GitVersion())
+    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"')
+  else
+    return ''
+  endif
+endfunction
+
 function! s:DirCheck(...) abort
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+  if empty(a:0 ? s:Dir(a:1) : s:Dir())
+    return 'return ' . string('echoerr "fugitive: not a Git repository"')
+  endif
+  return ''
+endfunction
+
+function! s:Mods(mods, ...) abort
+  let mods = substitute(a:mods, '\C<mods>', '', '')
+  let mods = mods =~# '\S$' ? a:mods . ' ' : a:mods
+  if a:0 && mods !~# '\<\%(aboveleft\|belowright\|leftabove\|rightbelow\|topleft\|botright\|tab\)\>'
+    let mods = a:1 . ' ' . mods
+  endif
+  return substitute(mods, '\s\+', ' ', 'g')
+=======
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   if !empty(a:0 ? s:Dir(a:1) : s:Dir())
+=======
+  let vcheck = s:VersionCheck()
+  if !empty(vcheck)
+    return vcheck
+  elseif !empty(a:0 ? s:Dir(a:1) : s:Dir())
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
     return ''
   elseif empty(bufname(''))
     return 'return ' . string('echoerr "fugitive: working directory does not belong to a Git repository"')
@@ -101,13 +132,15 @@ function! s:Mods(mods, ...) abort
   return substitute(mods, '\s\+', ' ', 'g')
 endfunction
 
-function! s:Slash(path) abort
-  if exists('+shellslash')
+if exists('+shellslash')
+  function! s:Slash(path) abort
     return tr(a:path, '\', '/')
-  else
+  endfunction
+else
+  function! s:Slash(path) abort
     return a:path
-  endif
-endfunction
+  endfunction
+endif
 
 function! s:Resolve(path) abort
   let path = resolve(a:path)
@@ -197,10 +230,180 @@ function! s:Map(mode, lhs, rhs, ...) abort
   endfor
 endfunction
 
+<<<<<<< HEAD
 " Section: Git
 
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+" Section: Quickfix
+
+function! s:QuickfixGet(nr, ...) abort
+  if a:nr < 0
+    return call('getqflist', a:000)
+  else
+    return call('getloclist', [a:nr] + a:000)
+  endif
+endfunction
+
+function! s:QuickfixSet(nr, ...) abort
+  if a:nr < 0
+    return call('setqflist', a:000)
+  else
+    return call('setloclist', [a:nr] + a:000)
+  endif
+endfunction
+
+function! s:QuickfixCreate(nr, opts) abort
+  if has('patch-7.4.2200')
+    call s:QuickfixSet(a:nr, [], ' ', a:opts)
+  else
+    call s:QuickfixSet(a:nr, [], ' ')
+  endif
+endfunction
+
+function! s:QuickfixStream(nr, event, title, cmd, first, callback, ...) abort
+  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'
+  if winnr != winnr()
+    wincmd p
+  endif
+
+  let buffer = []
+  let lines = split(s:SystemError(s:shellesc(a:cmd))[0], "\n")
+  for line in lines
+    call extend(buffer, call(a:callback, a:000 + [line]))
+    if len(buffer) >= 20
+      let contexts = map(copy(buffer), 'get(v:val, "context", {})')
+      lockvar contexts
+      call extend(opts.context.items, contexts)
+      unlet contexts
+      call s:QuickfixSet(a:nr, remove(buffer, 0, -1), 'a')
+      redraw
+    endif
+  endfor
+  call extend(buffer, call(a:callback, a:000 + [0]))
+  call extend(opts.context.items, map(copy(buffer), 'get(v:val, "context", {})'))
+  lockvar opts.context.items
+  call s:QuickfixSet(a:nr, buffer, 'a')
+
+  silent exe s:DoAutocmd('QuickFixCmdPost ' . event)
+  if a:first && len(s:QuickfixGet(a:nr))
+    call s:BlurStatus()
+    return a:nr < 0 ? 'cfirst' : 'lfirst'
+  else
+    return 'exe'
+  endif
+endfunction
+
+<<<<<<< HEAD
+" Section: Git
+
+function! s:ChdirArg(dir) abort
+endfunction
+
+=======
+let s:common_efm = ''
+      \ . '%+Egit:%.%#,'
+      \ . '%+Eusage:%.%#,'
+      \ . '%+Eerror:%.%#,'
+      \ . '%+Efatal:%.%#,'
+      \ . '%-G%.%#%\e[K%.%#,'
+      \ . '%-G%.%#%\r%.%\+'
+
+function! fugitive#Cwindow() abort
+  if &buftype == 'quickfix'
+    cwindow
+  else
+    botright cwindow
+    if &buftype == 'quickfix'
+      wincmd p
+    endif
+  endif
+endfunction
+
+=======
+>>>>>>> master
+" Section: Git
+
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+function! fugitive#Autowrite() abort
+  if &autowrite || &autowriteall
+    try
+      if &confirm
+        let reconfirm = 1
+        setglobal noconfirm
+      endif
+      silent! wall
+    finally
+      if exists('reconfirm')
+        setglobal confirm
+      endif
+    endtry
+  endif
+  return ''
+endfunction
+
+" Section: Git
+
+function! s:GitCmd() abort
+  if !exists('g:fugitive_git_executable')
+    return ['git']
+  elseif type(g:fugitive_git_executable) == type([])
+    return g:fugitive_git_executable
+  else
+    let dquote = '"\%([^"]\|""\|\\"\)*"\|'
+    let string = g:fugitive_git_executable
+    let list = []
+    if string =~# '^\w\+='
+      call add(list, 'env')
+    endif
+    while string =~# '\S'
+      let arg = matchstr(string, '^\s*\%(' . dquote . '''[^'']*''\|\\.\|[^[:space:] |]\)\+')
+      let string = strpart(string, len(arg))
+      let arg = substitute(arg, '^\s\+', '', '')
+      let arg = substitute(arg,
+            \ '\(' . dquote . '''\%(''''\|[^'']\)*''\|\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\)\|' . s:expand,
+            \ '\=submatch(0)[0] ==# "\\" ? submatch(0)[1] : submatch(0)[1:-2]', 'g')
+      call add(list, arg)
+    endwhile
+    return list
+  endif
+endfunction
+
+function! s:GitShellCmd() abort
+  if !exists('g:fugitive_git_executable')
+    return 'git'
+  elseif type(g:fugitive_git_executable) == type([])
+    return s:shellesc(g:fugitive_git_executable)
+  else
+    return g:fugitive_git_executable
+  endif
+endfunction
+
+function! s:UserCommandCwd(dir) abort
+  let tree = s:Tree(a:dir)
+  return len(tree) ? FugitiveVimPath(tree) : getcwd()
+endfunction
+
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 function! s:UserCommandList(...) abort
-  let git = split(get(g:, 'fugitive_git_command', g:fugitive_git_executable), '\s\+')
+  if !fugitive#GitVersion(1, 8, 5)
+    throw 'fugitive: Git 1.8.5 or higher required'
+  endif
+  if !exists('g:fugitive_git_command')
+    let git = s:GitCmd()
+  elseif type(g:fugitive_git_command) == type([])
+    let git = g:fugitive_git_command
+  else
+    let git = split(g:fugitive_git_command, '\s\+')
+  endif
   let flags = []
   if a:0 && type(a:1) == type({})
     let git = copy(get(a:1, 'git', git))
@@ -216,11 +419,19 @@ function! s:UserCommandList(...) abort
     if empty(tree)
       call add(git, '--git-dir=' . FugitiveGitPath(dir))
     elseif len(tree) && s:cpath(tree) !=# s:cpath(getcwd())
+<<<<<<< HEAD
       if fugitive#GitVersion(1, 8, 5)
         call extend(git, ['-C', FugitiveGitPath(tree)])
       else
         throw 'fugitive: Git 1.8.5 or higher required to change directory'
       endif
+<<<<<<< HEAD
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+      call extend(git, ['-C', FugitiveGitPath(tree)])
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     endif
   endif
   return git + flags
@@ -232,13 +443,14 @@ endfunction
 
 let s:git_versions = {}
 function! fugitive#GitVersion(...) abort
-  if !has_key(s:git_versions, g:fugitive_git_executable)
-    let s:git_versions[g:fugitive_git_executable] = matchstr(system(g:fugitive_git_executable.' --version'), '\d[^[:space:]]\+')
+  let git = s:GitShellCmd()
+  if !has_key(s:git_versions, git)
+    let s:git_versions[git] = matchstr(s:SystemError(git.' --version')[0], '\d[^[:space:]]\+')
   endif
   if !a:0
-    return s:git_versions[g:fugitive_git_executable]
+    return s:git_versions[git]
   endif
-  let components = split(s:git_versions[g:fugitive_git_executable], '\D\+')
+  let components = split(s:git_versions[git], '\D\+')
   if empty(components)
     return -1
   endif
@@ -299,8 +511,7 @@ function! s:HasOpt(args, ...) abort
 endfunction
 
 function! s:PreparePathArgs(cmd, dir, literal) abort
-  let literal_supported = fugitive#GitVersion(1, 9)
-  if a:literal && literal_supported
+  if a:literal
     call insert(a:cmd, '--literal-pathspecs')
   endif
   let split = index(a:cmd, '--')
@@ -317,8 +528,6 @@ function! s:PreparePathArgs(cmd, dir, literal) abort
       let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), './', a:dir)
     elseif a:literal
       let a:cmd[i] = fugitive#Path(a:cmd[i], './', a:dir)
-    elseif !literal_supported
-      let a:cmd[i] = substitute(a:cmd[i], '^:\%(/\|([^)]*)\)\=:\=', './', '')
     endif
   endfor
   return a:cmd
@@ -329,7 +538,11 @@ let s:prepare_env = {
       \ 'core.editor': 'GIT_EDITOR',
       \ 'core.askpass': 'GIT_ASKPASS',
       \ }
-function! fugitive#PrepareDirEnvArgv(...) abort
+function! fugitive#PrepareDirEnvGitArgv(...) 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
   else
@@ -338,7 +551,15 @@ function! fugitive#PrepareDirEnvArgv(...) abort
   let env = {}
   let i = 0
   while i < len(cmd)
-    if cmd[i] =~# '^$\|[\/.]' && cmd[i] !~# '^-'
+    if type(cmd[i]) == type({})
+      if has_key(cmd[i], 'dir')
+        let dir = cmd[i].dir
+      endif
+      if has_key(cmd[i], 'git')
+        let git = cmd[i].git
+      endif
+      call remove(cmd, i)
+    elseif cmd[i] =~# '^$\|[\/.]' && cmd[i] !~# '^-'
       let dir = remove(cmd, i)
     elseif cmd[i] =~# '^--git-dir='
       let dir = remove(cmd, i)[10:-1]
@@ -351,18 +572,14 @@ function! fugitive#PrepareDirEnvArgv(...) abort
         let val = matchstr(cmd[i+1], '=\zs.*')
         let env[var] = val
       endif
-      if fugitive#GitVersion(1, 8) && cmd[i+1] =~# '\.'
+      if cmd[i+1] =~# '\.'
         let i += 2
       else
         call remove(cmd, i, i + 1)
       endif
     elseif cmd[i] =~# '^--.*pathspecs$'
       let explicit_pathspec_option = 1
-      if fugitive#GitVersion(1, 9)
-        let i += 1
-      else
-        call remove(cmd, i)
-      endif
+      let i += 1
     elseif cmd[i] !~# '^-'
       break
     else
@@ -373,7 +590,7 @@ function! fugitive#PrepareDirEnvArgv(...) abort
     let dir = s:Dir()
   endif
   call s:PreparePathArgs(cmd, dir, !exists('explicit_pathspec_option'))
-  return [dir, env, cmd]
+  return [dir, env, git, cmd]
 endfunction
 
 function! s:BuildEnvPrefix(env) abort
@@ -393,7 +610,7 @@ endfunction
 function! s:JobOpts(cmd, env) abort
   if empty(a:env)
     return [a:cmd, {}]
-  elseif has('patch-8.2.0239') || 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-0.5.1') || has('patch-8.1.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, "=")')
@@ -409,23 +626,30 @@ function! s:JobOpts(cmd, env) abort
   endif
 endfunction
 
-function! s:BuildShell(dir, env, args) abort
+function! s:BuildShell(dir, env, git, args) abort
   let cmd = copy(a:args)
   let tree = s:Tree(a:dir)
   let pre = s:BuildEnvPrefix(a:env)
   if empty(tree) || index(cmd, '--') == len(cmd) - 1
     call insert(cmd, '--git-dir=' . FugitiveGitPath(a:dir))
+<<<<<<< HEAD
   elseif fugitive#GitVersion(1, 8, 5)
     call extend(cmd, ['-C', FugitiveGitPath(tree)], 'keep')
+<<<<<<< HEAD
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   else
-    let pre = 'cd ' . s:shellesc(tree) . (s:winshell() ? '& ' : '; ') . pre
+    call extend(cmd, ['-C', FugitiveGitPath(tree)], 'keep')
   endif
-  return pre . g:fugitive_git_executable . ' ' . join(map(cmd, 's:shellesc(v:val)'))
+  return pre . join(map(a:git + cmd, 's:shellesc(v:val)'))
 endfunction
 
 function! fugitive#Prepare(...) abort
-  let [dir, env, argv] = call('fugitive#PrepareDirEnvArgv', a:000)
-  return s:BuildShell(dir, env, argv)
+  let [dir, env, git, argv] = call('fugitive#PrepareDirEnvGitArgv', a:000)
+  return s:BuildShell(dir, env, git, argv)
 endfunction
 
 function! s:SystemError(cmd, ...) abort
@@ -438,6 +662,17 @@ function! s:SystemError(cmd, ...) abort
         set shellredir=>%s\ 2>&1
       endif
     endif
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+    if exists('+guioptions') && &guioptions =~# '!'
+      let guioptions = &guioptions
+      set guioptions-=!
+    endif
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     let out = call('system', [type(a:cmd) ==# type([]) ? fugitive#Prepare(a:cmd) : a:cmd] + a:000)
     return [out, v:shell_error]
   catch /^Vim\%((\a\+)\)\=:E484:/
@@ -449,6 +684,16 @@ function! s:SystemError(cmd, ...) abort
     if exists('shellredir')
       let &shellredir = shellredir
     endif
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+    if exists('guioptions')
+      let &guioptions = guioptions
+    endif
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   endtry
 endfunction
 
@@ -539,9 +784,10 @@ let s:config = {}
 function! fugitive#Config(...) abort
   let dir = s:Dir()
   let name = ''
+  let default = get(a:, 3, '')
   if a:0 >= 2 && type(a:2) == type({})
     let name = substitute(a:1, '^[^.]\+\|[^.]\+$', '\L&', 'g')
-    return len(a:1) ? get(get(a:2, name, []), 0, '') : a:2
+    return len(a:1) ? get(get(a:2, name, []), 0, default) : a:2
   elseif a:0 >= 2
     let dir = a:2
     let name = a:1
@@ -576,28 +822,82 @@ function! fugitive#Config(...) abort
     let s:config[dir_key] = [s:ConfigTimestamps(dir, dict), dict]
     lockvar! dict
   endif
-  return len(name) ? get(get(dict, name, []), 0, '') : dict
+  return len(name) ? get(get(dict, name, []), 0, default) : dict
 endfunction
 
 function! s:Remote(dir) abort
   let head = FugitiveHead(0, a:dir)
-  let remote = len(head) ? fugitive#Config('branch.' . head . '.remote') : ''
+  let remote = len(head) ? FugitiveConfigGet('branch.' . head . '.remote', a:dir) : ''
   let i = 10
   while remote ==# '.' && i > 0
-    let head = matchstr(fugitive#Config('branch.' . head . '.merge'), 'refs/heads/\zs.*')
-    let remote = len(head) ? fugitive#Config('branch.' . head . '.remote') : ''
+    let head = matchstr(FugitiveConfigGet('branch.' . head . '.merge', a:dir), 'refs/heads/\zs.*')
+    let remote = len(head) ? FugitiveConfigGet('branch.' . head . '.remote', a:dir) : ''
     let i -= 1
   endwhile
   return remote =~# '^\.\=$' ? 'origin' : remote
 endfunction
 
+unlet! s:ssh_aliases
+function! fugitive#SshHostAlias(...) abort
+  if !exists('s:ssh_aliases')
+    let s:ssh_aliases = {}
+    if filereadable(expand('~/.ssh/config'))
+      let hosts = []
+      for line in readfile(expand('~/.ssh/config'))
+        let key = matchstr(line, '^\s*\zs\w\+\ze\s')
+        let value = matchstr(line, '^\s*\w\+\s\+\zs.*\S')
+        if key ==? 'host'
+          let hosts = split(value, '\s\+')
+        elseif key ==? 'hostname'
+          for host in hosts
+            if !has_key(s:ssh_aliases, host)
+              let s:ssh_aliases[host] = tolower(value)
+            endif
+          endfor
+        endif
+      endfor
+    endif
+  endif
+  if a:0
+    return get(s:ssh_aliases, a:1, a:1)
+  else
+    return s:ssh_aliases
+  endif
+endfunction
+
+let s:redirects = {}
+
+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 ' .
+            \ s:shellesc(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
+  endif
+  return substitute(a:remote,
+        \ '^ssh://\%([^@:/]\+@\)\=\zs[^/:]\+\|^\%([^@:/]\+@\)\=\zs[^/:]\+\ze:/\@!',
+        \ '\=fugitive#SshHostAlias(submatch(0))', '')
+endfunction
+
 function! fugitive#RemoteUrl(...) abort
   let dir = a:0 > 1 ? a:2 : s:Dir()
-  let remote = !a:0 || a:1 =~# '^\.\=$' ? s:Remote(dir) : a:1
-  if !fugitive#GitVersion(2, 7)
-    return fugitive#Config('remote.' . remote . '.url')
+  let url = !a:0 || a:1 =~# '^\.\=$' ? s:Remote(dir) : a:1
+  if url !~# ':\|^/\|^\.\.\=/'
+    if !fugitive#GitVersion(2, 7)
+      let url = FugitiveConfigGet('remote.' . url . '.url')
+    else
+      let url = s:ChompDefault('', [dir, 'remote', 'get-url', url, '--'])
+    endif
   endif
-  return s:ChompDefault('', [dir, 'remote', 'get-url', remote, '--'])
+  if !get(a:, 3, 0)
+    let url = fugitive#ResolveRemote(url)
+  endif
+  return url
 endfunction
 
 " Section: Quickfix
@@ -626,7 +926,8 @@ function! s:QuickfixCreate(nr, opts) abort
   endif
 endfunction
 
-function! s:QuickfixStream(nr, event, title, cmd, first, callback, ...) abort
+function! s:QuickfixStream(nr, event, title, cmd, first, mods, callback, ...) abort
+  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
@@ -647,7 +948,9 @@ function! s:QuickfixStream(nr, event, title, cmd, first, callback, ...) abort
       call extend(opts.context.items, contexts)
       unlet contexts
       call s:QuickfixSet(a:nr, remove(buffer, 0, -1), 'a')
-      redraw
+      if mods !~# '\<silent\>'
+        redraw
+      endif
     endif
   endfor
   call extend(buffer, call(a:callback, a:000 + [0]))
@@ -658,7 +961,7 @@ function! s:QuickfixStream(nr, event, title, cmd, first, callback, ...) abort
   silent exe s:DoAutocmd('QuickFixCmdPost ' . event)
   if a:first && len(s:QuickfixGet(a:nr))
     call s:BlurStatus()
-    return a:nr < 0 ? 'cfirst' : 'lfirst'
+    return mods . (a:nr < 0 ? 'cfirst' : 'lfirst')
   else
     return 'exe'
   endif
@@ -740,7 +1043,7 @@ function! s:repo_prepare(...) dict abort
 endfunction
 
 function! s:repo_git_command(...) dict abort
-  let git = g:fugitive_git_executable . ' --git-dir='.s:shellesc(self.git_dir)
+  let git = s:GitShellCmd() . ' --git-dir='.s:shellesc(self.git_dir)
   return git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'')
 endfunction
 
@@ -765,7 +1068,7 @@ endfunction
 call s:add_methods('repo',['superglob'])
 
 function! s:repo_config(name) dict abort
-  return fugitive#Config(a:name, self.git_dir)
+  return FugitiveConfigGet(a:name, self.git_dir)
 endfunction
 
 function! s:repo_user() dict abort
@@ -813,16 +1116,30 @@ function! s:Owner(path, ...) abort
     if commit =~# '^\x\{40,\}$'
       return commit
     elseif commit ==# '2'
-      return 'HEAD^{}'
+      return '@'
     elseif commit ==# '0'
       return ''
     endif
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+    if filereadable(actualdir . 'MERGE_HEAD')
+      let merge_head = 'MERGE_HEAD'
+    elseif filereadable(actualdir . 'REBASE_HEAD')
+      let merge_head = 'REBASE_HEAD'
+    else
+=======
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     let merge_head = s:MergeHead()
+=======
+    let merge_head = s:MergeHead(dir)
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
     if empty(merge_head)
       return ''
     endif
     if commit ==# '3'
-      return merge_head . '^{}'
+      return merge_head
     elseif commit ==# '1'
       return s:TreeChomp('merge-base', 'HEAD', merge_head, '--')
     endif
@@ -882,8 +1199,8 @@ function! fugitive#Path(url, ...) abort
   endif
   let url = a:url
   let temp_state = s:TempState(url)
-  if has_key(temp_state, 'bufnr')
-    let url = bufname(temp_state.bufnr)
+  if has_key(temp_state, 'origin_bufnr')
+    let url = bufname(temp_state.origin_bufnr)
   endif
   let url = s:Slash(fnamemodify(url, ':p'))
   if url =~# '/$' && s:Slash(a:url) !~# '/$'
@@ -917,20 +1234,21 @@ function! fugitive#Find(object, ...) abort
     let prefix = matchstr(a:object, '^[~$]\i*')
     let owner = expand(prefix)
     return FugitiveVimPath((len(owner) ? owner : prefix) . strpart(a:object, len(prefix)))
-  elseif s:Slash(a:object) =~# '^$\|^/\|^\%(\a\a\+:\).*\%(//\|::\)' . (has('win32') ? '\|^\a:/' : '')
+  endif
+  let rev = s:Slash(a:object)
+  if rev =~# '^$\|^/\|^\%(\a\a\+:\).*\%(//\|::\)' . (has('win32') ? '\|^\a:/' : '')
     return FugitiveVimPath(a:object)
-  elseif s:Slash(a:object) =~# '^\.\.\=\%(/\|$\)'
+  elseif rev =~# '^\.\.\=\%(/\|$\)'
     return FugitiveVimPath(simplify(getcwd() . '/' . a:object))
   endif
   let dir = a:0 ? a:1 : s:Dir()
   if empty(dir)
-    let file = matchstr(a:object, '^\%(:\d:\|[^:]*:\)\zs.*', '', '')
+    let file = matchstr(a:object, '^\%(:\d:\|[^:]*:\)\zs\%(\.\.\=$\|\.\.\=/.*\|/.*\|\w:/.*\)')
     let dir = FugitiveExtractGitDir(file)
     if empty(dir)
-      return fnamemodify(FugitiveVimPath(len(file) ? file : a:object), ':p')
+      return ''
     endif
   endif
-  let rev = s:Slash(a:object)
   let tree = s:Tree(dir)
   let base = len(tree) ? tree : 'fugitive://' . dir . '//0'
   if rev ==# '.git'
@@ -951,7 +1269,7 @@ function! fugitive#Find(object, ...) abort
       let f = simplify(dir . f)
     endif
   elseif rev ==# ':/'
-    let f = base
+    let f = tree
   elseif rev =~# '^\.\%(/\|$\)'
     let f = base . rev[1:-1]
   elseif rev =~# '^::\%(/\|\a\+\:\)'
@@ -989,7 +1307,7 @@ function! fugitive#Find(object, ...) abort
     let f = 'fugitive://' . dir . '//0/' . rev[1:-1]
   else
     if !exists('f')
-      let commit = substitute(matchstr(rev, '^\%([^:.-]\|\.\.[^/:]\)[^:]*\|^:.*'), '^@\%($\|[~^]\|@{\)\@=', 'HEAD', '')
+      let commit = matchstr(rev, '^\%([^:.-]\|\.\.[^/:]\)[^:]*\|^:.*')
       let file = substitute(matchstr(rev, '^\%([^:.-]\|\.\.[^/:]\)[^:]*\zs:.*'), '^:', '/', '')
       if file =~# '^/\.\.\=\%(/\|$\)\|^//\|^/\a\+:'
         let file = file =~# '^/\.' ? simplify(getcwd() . file) : file[1:-1]
@@ -1005,11 +1323,26 @@ function! fugitive#Find(object, ...) abort
       endif
       let commits = split(commit, '\.\.\.-\@!', 1)
       if len(commits) == 2
-        call map(commits, 'empty(v:val) || v:val ==# "@" ? "HEAD" : v:val')
+        call map(commits, 'empty(v:val) ? "@" : v:val')
         let commit = matchstr(s:ChompDefault('', [dir, 'merge-base'] + commits + ['--']), '\<[0-9a-f]\{40,\}\>')
       endif
-      if commit !~# '^[0-9a-f]\{40,\}$'
+      if commit !~# '^[0-9a-f]\{40,\}$\|^$'
         let commit = matchstr(s:ChompDefault('', [dir, 'rev-parse', '--verify', commit . (len(file) ? '^{}' : ''), '--']), '\<[0-9a-f]\{40,\}\>')
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+        if empty(commit) && len(file)
+          let commit = repeat('0', 40)
+        endif
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+      endif
+      if len(commit)
+        let f = 'fugitive://' . dir . '//' . commit . file
+      else
+        let f = base . '/' . substitute(rev, '^:/:\=\|^[^:]\+:', '', '')
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
       endif
       let f = 'fugitive://' . dir . '//' . (len(commit) ? commit : repeat('0', 40)) . file
     endif
@@ -1017,8 +1350,16 @@ function! fugitive#Find(object, ...) abort
   return FugitiveVimPath(f)
 endfunction
 
-function! s:Generate(rev, ...) abort
-  return fugitive#Find(a:rev, a:0 ? a:1 : s:Dir())
+function! s:Generate(object, ...) abort
+  let dir = a:0 ? a:1 : s:Dir()
+  let f = fugitive#Find(a:object, dir)
+  if !empty(f)
+    return f
+  elseif a:object ==# ':/'
+    return len(dir) ? FugitiveVimPath('fugitive://' . dir . '//0') : '.'
+  endif
+  let file = matchstr(a:object, '^\%(:\d:\|[^:]*:\)\zs.*')
+  return fnamemodify(FugitiveVimPath(len(file) ? file : a:object), ':p')
 endfunction
 
 function! s:DotRelative(path, ...) abort
@@ -1037,7 +1378,7 @@ function! fugitive#Object(...) abort
     let rev = ''
   endif
   let tree = s:Tree(dir)
-  let full = a:0 ? a:1 : @%
+  let full = a:0 ? a:1 : s:BufName('%')
   let full = fnamemodify(full, ':p' . (s:Slash(full) =~# '/$' ? '' : ':s?/$??'))
   if empty(rev) && empty(tree)
     return FugitiveGitPath(full)
@@ -1054,15 +1395,15 @@ function! fugitive#Object(...) abort
   endif
 endfunction
 
-let s:var = '\%(%\|#<\=\d\+\|##\=\)'
+let s:var = '\%(<\%(cword\|cWORD\|cexpr\|cfile\|sfile\|slnum\|afile\|abuf\|amatch' . (has('clientserver') ? '\|client' : '') . '\)>\|%\|#<\=\d\+\|##\=\)'
 let s:flag = '\%(:[p8~.htre]\|:g\=s\(.\).\{-\}\1.\{-\}\1\)'
 let s:expand = '\%(\(' . s:var . '\)\(' . s:flag . '*\)\(:S\)\=\)'
 
 function! s:BufName(var) abort
   if a:var ==# '%'
-    return bufname(get(s:TempState(), 'bufnr', ''))
+    return bufname(get(s:TempState(), 'origin_bufnr', ''))
   elseif a:var =~# '^#\d*$'
-    let nr = get(s:TempState(bufname(+a:var[1:-1])), 'bufnr', '')
+    let nr = get(s:TempState(bufname(+a:var[1:-1])), 'origin_bufnr', '')
     return bufname(nr ? nr : +a:var[1:-1])
   else
     return expand(a:var)
@@ -1089,19 +1430,44 @@ 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:var ==# '<cfile>'
+    let bufname = expand('<cfile>')
+    if v:version >= 704 && get(maparg('<Plug><cfile>', 'c', 0, 1), 'expr')
+      try
+        let bufname = eval(maparg('<Plug><cfile>', 'c'))
+        if bufname ==# "\<C-R>\<C-F>"
+          let bufname = expand('<cfile>')
+        endif
+      catch
+      endtry
+    endif
+  elseif a:var =~# '^<'
+    let bufname = s:BufName(a:var)
+  else
+    let bufname = fugitive#Real(s:BufName(a:var))
   endif
   let flags = a:flags
-  let file = s:DotRelative(fugitive#Real(s:BufName(a:var)), cwd)
+  let file = s:DotRelative(bufname, cwd)
   while len(flags)
     let flag = matchstr(flags, s:flag)
     let flags = strpart(flags, len(flag))
     if flag ==# ':.'
-      let file = s:DotRelative(file, cwd)
+      let file = s:DotRelative(fugitive#Real(file), cwd)
     else
       let file = fnamemodify(file, flag)
     endif
   endwhile
   let file = s:Slash(file)
+  if file =~# '^fugitive://'
+    let [dir, commit, file_candidate] = s:DirCommitFile(file)
+    let tree = s:Tree(dir)
+    if len(tree) && len(file_candidate)
+      let file = (commit =~# '^.$' ? ':' : '') . commit . ':' .
+            \ s:DotRelative(tree . file_candidate)
+    elseif empty(file_candidate) && commit !~# '^.$'
+      let file = commit
+    endif
+  endif
   return (len(a:esc) ? shellescape(file) : file)
 endfunction
 
@@ -1128,17 +1494,26 @@ function! fugitive#Expand(object) abort
         \ '\=s:ExpandVar(submatch(1),submatch(2),submatch(3),submatch(5))', 'g')
 endfunction
 
-function! s:ExpandSplit(string, ...) abort
+function! s:SplitExpandChain(string, ...) abort
   let list = []
   let string = a:string
+<<<<<<< HEAD
   let handle_bar = a:0 && a:1
   let dquote = handle_bar ? '"\%([^"]\|""\|\\"\)*"\|' : ''
   let cwd = a:0 > 1 ? a:2 : getcwd()
+<<<<<<< HEAD
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+  let dquote = '"\%([^"]\|""\|\\"\)*"\|'
+  let cwd = a:0 ? a:1 : getcwd()
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   while string =~# '\S'
-    if handle_bar && string =~# '^\s*|'
+    if string =~# '^\s*|'
       return [list, substitute(string, '^\s*', '', '')]
     endif
-    let arg = matchstr(string, '^\s*\%(' . dquote . '''[^'']*''\|\\.\|[^[:space:] ' . (handle_bar ? '|' : '') . ']\)\+')
+    let arg = matchstr(string, '^\s*\%(' . dquote . '''[^'']*''\|\\.\|[^[:space:] |]\)\+')
     let string = strpart(string, len(arg))
     let arg = substitute(arg, '^\s\+', '', '')
     if !exists('seen_separator')
@@ -1153,6 +1528,7 @@ function! s:ExpandSplit(string, ...) abort
       let seen_separator = 1
     endif
   endwhile
+<<<<<<< HEAD
   return handle_bar ? [list, ''] : list
 endfunction
 
@@ -1162,6 +1538,24 @@ endfunction
 
 function! s:SplitExpandChain(string, ...) abort
   return s:ExpandSplit(a:string, 1, a:0 ? a:1 : getcwd())
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+endfunction
+
+function! s:ShellExpand(cmd, ...) abort
+  return s:shellesc(s:SplitExpand(a:cmd, a:0 ? a:1 : getcwd()))
+endfunction
+
+function! s:ShellExpandChain(cmd, ...) abort
+  let [args, after] = s:SplitExpandChain(a:cmd, a:0 ? a:1 : getcwd())
+  return [s:shellesc(args), after]
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+  return [list, '']
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 endfunction
 
 let s:trees = {}
@@ -1306,7 +1700,7 @@ function! fugitive#getfperm(url) abort
   return perm ==# '---------' ? '' : perm
 endfunction
 
-function s:UpdateIndex(dir, info) abort
+function! s:UpdateIndex(dir, info) abort
   let info = join(a:info[0:-2]) . "\t" . a:info[-1] . "\n"
   let [error, exec_error] = s:SystemError([a:dir, 'update-index', '--index-info'], info)
   return !exec_error ? '' : len(error) ? error : 'fugitive: unknown update-index error'
@@ -1481,11 +1875,33 @@ function! s:FilterEscape(items, ...) abort
   return items
 endfunction
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+call s:add_methods('buffer',['getvar','getline','repo','type','spec','name','commit','path','relative'])
+
+" Section: Completion
+
+function! s:FilterEscape(items, ...) abort
+  let items = copy(a:items)
+  if a:0 && type(a:1) == type('')
+    call filter(items, 'strpart(v:val, 0, strlen(a:1)) ==# a:1')
+  endif
+  return map(items, 's:fnameescape(v:val)')
+endfunction
+
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 function! s:GlobComplete(lead, pattern) abort
+=======
+function! s:GlobComplete(lead, pattern, ...) abort
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
   if a:lead ==# '/'
     return []
   elseif v:version >= 704
-    let results = glob(a:lead . a:pattern, 0, 1)
+    let results = glob(a:lead . a:pattern, a:0 ? a:1 : 0, 1)
   else
     let results = split(glob(a:lead . a:pattern), "\n")
   endif
@@ -1585,8 +2001,7 @@ function! fugitive#CompleteObject(base, ...) abort
     let parent = matchstr(a: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,'tree.s:sub(v:val,".*\t","")')
-
+    call map(entries,'parent.s:sub(v:val,".*\t","")')
   endif
   return s:FilterEscape(entries, a:base)
 endfunction
@@ -1648,8 +2063,17 @@ endfunction
 
 function! s:QueryLog(refspec) abort
   let lines = s:LinesError(['log', '-n', '256', '--pretty=format:%h%x09%s', a:refspec, '--'])[0]
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   call map(lines, 'split(v:val, "\t")')
   call map(lines, '{"type": "Log", "commit": v:val[0], "subject": v:val[-1]}')
+=======
+  call map(lines, 'split(v:val, "\t", 1)')
+  call map(lines, '{"type": "Log", "commit": v:val[0], "subject": join(v:val[1 : -1], "\t")}')
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
   return lines
 endfunction
 
@@ -1733,7 +2157,11 @@ function! fugitive#BufReadStatus() abort
     let [staged, unstaged, untracked] = [[], [], []]
     let props = {}
 
-    if fugitive#GitVersion(2, 11)
+    let pull = ''
+    if empty(s:Tree())
+      let branch = FugitiveHead(0)
+      let head = FugitiveHead(11)
+    elseif fugitive#GitVersion(2, 11)
       let cmd += ['status', '--porcelain=v2', '-bz']
       let [output, message, exec_error] = s:NullError(cmd)
       if exec_error
@@ -1763,10 +2191,11 @@ function! fugitive#BufReadStatus() abort
           endif
           let sub = matchstr(line, '^[12u] .. \zs....')
           if line[2] !=# '.'
-            call add(staged, {'type': 'File', 'status': line[2], 'filename': files, 'sub': sub})
+            call add(staged, {'type': 'File', 'status': line[2], 'filename': files, 'submodule': sub})
           endif
           if line[3] !=# '.'
-            call add(unstaged, {'type': 'File', 'status': get({'C':'M','M':'?','U':'?'}, matchstr(sub, 'S\.*\zs[CMU]'), line[3]), 'filename': file, 'sub': sub})
+            let sub = matchstr(line, '^[12u] .. \zs....')
+            call add(unstaged, {'type': 'File', 'status': get({'C':'M','M':'?','U':'?'}, matchstr(sub, 'S\.*\zs[CMU]'), line[3]), 'filename': file, 'submodule': sub})
           endif
         endif
         let i += 1
@@ -1791,7 +2220,6 @@ function! fugitive#BufReadStatus() abort
         call remove(output, 0)
       endwhile
       let head = matchstr(output[0], '^## \zs\S\+\ze\%($\| \[\)')
-      let pull = ''
       if head =~# '\.\.\.'
         let [head, pull] = split(head, '\.\.\.')
         let branch = head
@@ -1816,20 +2244,16 @@ function! fugitive#BufReadStatus() abort
           let i += 1
         endif
         if line[0] !~# '[ ?!#]'
-          call add(staged, {'type': 'File', 'status': line[0], 'filename': files, 'sub': ''})
+          call add(staged, {'type': 'File', 'status': line[0], 'filename': files, 'submodule': ''})
         endif
         if line[0:1] ==# '??'
           call add(untracked, {'type': 'File', 'status': line[1], 'filename': files})
         elseif line[1] !~# '[ !#]'
-          call add(unstaged, {'type': 'File', 'status': line[1], 'filename': file, 'sub': ''})
+          call add(unstaged, {'type': 'File', 'status': line[1], 'filename': file, 'submodule': ''})
         endif
       endwhile
     endif
 
-    if empty(s:Tree())
-      let [unstaged, untracked] = [[], []]
-    endif
-
     for dict in staged
       let b:fugitive_files['Staged'][dict.filename] = dict
     endfor
@@ -1839,9 +2263,9 @@ function! fugitive#BufReadStatus() abort
 
     let pull_type = 'Pull'
     if len(pull)
-      let rebase = fugitive#Config('branch.' . branch . '.rebase', config)
+      let rebase = FugitiveConfigGet('branch.' . branch . '.rebase', config)
       if empty(rebase)
-        let rebase = fugitive#Config('pull.rebase', config)
+        let rebase = FugitiveConfigGet('pull.rebase', config)
       endif
       if rebase =~# '^\%(true\|yes\|on\|1\|interactive\|merges\|preserve\)$'
         let pull_type = 'Rebase'
@@ -1850,11 +2274,11 @@ function! fugitive#BufReadStatus() abort
       endif
     endif
 
-    let push_remote = fugitive#Config('branch.' . branch . '.pushRemote', config)
+    let push_remote = FugitiveConfigGet('branch.' . branch . '.pushRemote', config)
     if empty(push_remote)
-      let push_remote = fugitive#Config('remote.pushDefault', config)
+      let push_remote = FugitiveConfigGet('remote.pushDefault', config)
     endif
-    let fetch_remote = fugitive#Config('branch.' . branch . '.remote', config)
+    let fetch_remote = FugitiveConfigGet('branch.' . branch . '.remote', config)
     if empty(fetch_remote)
       let fetch_remote = 'origin'
     endif
@@ -1862,7 +2286,7 @@ function! fugitive#BufReadStatus() abort
       let push_remote = fetch_remote
     endif
 
-    let push_default = fugitive#Config('push.default')
+    let push_default = FugitiveConfigGet('push.default', config)
     if empty(push_default)
       let push_default = fugitive#GitVersion(2) ? 'simple' : 'matching'
     endif
@@ -1959,7 +2383,11 @@ function! fugitive#BufReadStatus() abort
     if &bufhidden ==# ''
       setlocal bufhidden=delete
     endif
+<<<<<<< HEAD
     let b:dispatch = '-dir=' . fnameescape(len(s:Tree()) ? s:Tree() : s:Dir()) . ' ' . g:fugitive_git_executable . ' fetch --all'
+=======
+    let b:dispatch = '-dir=' . fnameescape(len(s:Tree()) ? s:Tree() : s:Dir()) . ' ' . s:GitShellCmd() . ' fetch --all'
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     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>')
@@ -1974,7 +2402,7 @@ function! fugitive#BufReadStatus() abort
     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 ':Gstatus 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>')
     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>')
@@ -1983,7 +2411,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', ":<C-U>execute <SID>StageDiff('Gdiffsplit')<Bar>redraw<Bar>echohl WarningMsg<Bar> echo ':Gstatus D is deprecated in favor of dd'<Bar>echohl NONE<CR>", '<silent>')
+    call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent>')
     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>')
@@ -1997,7 +2425,7 @@ 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 :<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<Bar>echohl WarningMsg<Bar>echo ':Gstatus q is deprecated in favor of gq or the built-in <Lt>C-W>q'<Bar>echohl NONE<CR>
+      nnoremap <buffer> <silent> q :echoerr "fugitive: q 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>')
@@ -2083,6 +2511,7 @@ function! fugitive#BufReadCmd(...) abort
     if empty(dir)
       return 'echo "Invalid Fugitive URL"'
     endif
+    let b:git_dir = dir
     if rev =~# '^:\d$'
       let b:fugitive_type = 'stage'
     else
@@ -2124,6 +2553,9 @@ function! fugitive#BufReadCmd(...) abort
     setlocal endofline
 
     try
+      if b:fugitive_type !=# 'blob'
+        setlocal foldmarker=<<<<<<<<,>>>>>>>>
+      endif
       silent exe s:DoAutocmd('BufReadPre')
       if b:fugitive_type ==# 'tree'
         let b:fugitive_display_format = b:fugitive_display_format % 2
@@ -2177,7 +2609,7 @@ function! fugitive#BufReadCmd(...) abort
       endif
       let &l:modifiable = modifiable
       if b:fugitive_type !=# 'blob'
-        setlocal filetype=git foldmethod=syntax
+        setlocal filetype=git
         call s:Map('n', 'a', ":<C-U>let b:fugitive_display_format += v:count1<Bar>exe fugitive#BufReadCmd(@%)<CR>", '<silent>')
         call s:Map('n', 'i', ":<C-U>let b:fugitive_display_format -= v:count1<Bar>exe fugitive#BufReadCmd(@%)<CR>", '<silent>')
       endif
@@ -2186,12 +2618,6 @@ function! fugitive#BufReadCmd(...) abort
 
     setlocal modifiable
 
-    let browsex = maparg('<Plug>NetrwBrowseX', 'n')
-    let remote_check = '\Cnetrw#CheckIfRemote(\%(netrw#GX()\)\=)'
-    if browsex =~# remote_check
-      exe 'nnoremap <silent> <buffer> <Plug>NetrwBrowseX' substitute(browsex, remote_check, '0', 'g')
-    endif
-
     return 'silent ' . s:DoAutocmd('BufReadPost') .
           \ (modifiable ? '' : '|setl nomodifiable') . '|silent ' .
           \ s:DoAutocmd('User Fugitive' . substitute(b:fugitive_type, '^\l', '\u&', ''))
@@ -2227,15 +2653,33 @@ function! s:TempState(...) abort
   return get(s:temp_files, s:cpath(fnamemodify(a:0 ? a:1 : @%, ':p')), {})
 endfunction
 
+function! fugitive#Result(...) abort
+  if !a:0 && exists('g:fugitive_event')
+    return get(g:, 'fugitive_result', {})
+  elseif !a:0 || type(a:1) == type('') && a:1 =~# '^-\=$'
+    return get(g:, '_fugitive_last_job', {})
+  elseif type(a:1) == type(0)
+    return s:TempState(bufname(a:1))
+  elseif type(a:1) == type('')
+    return s:TempState(a:1)
+  elseif type(a:1) == type({}) && has_key(a:1, 'file')
+    return s:TempState(a:1.file)
+  else
+    return {}
+  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)]
     setlocal nomodeline
-    setlocal bufhidden=delete
+    if empty(&bufhidden)
+      setlocal bufhidden=delete
+    endif
     setlocal buftype=nowrite
     setlocal nomodifiable
+    let b:git_dir = dict.dir
     if len(dict.dir)
-      let b:git_dir = dict.dir
       call extend(b:, {'fugitive_type': 'temp'}, 'keep')
     endif
   endif
@@ -2244,31 +2688,52 @@ endfunction
 function! s:TempReadPost(file) abort
   if has_key(s:temp_files, s:cpath(a:file))
     let dict = s:temp_files[s:cpath(a:file)]
-    setlocal nobuflisted
-    if has_key(dict, 'filetype') && dict.filetype !=# &l:filetype
-      let &l:filetype = dict.filetype
+    if !has_key(dict, 'job')
+      setlocal nobuflisted
     endif
+<<<<<<< HEAD
     setlocal foldmarker=<<<<<<<,>>>>>>>
     if empty(mapcheck('q', 'n'))
       nnoremap <buffer> <silent> q    :<C-U>bdelete<Bar>echohl WarningMsg<Bar>echo "Temp file q is deprecated in favor of the built-in <Lt>C-W>q"<Bar>echohl NONE<CR>
+=======
+    if get(dict, 'filetype', '') ==# 'git'
+      call fugitive#MapJumps()
     endif
+    if has_key(dict, 'filetype')
+      let &l:filetype = dict.filetype
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+    endif
+    setlocal foldmarker=<<<<<<<<,>>>>>>>>
     if !&modifiable
+      if empty(mapcheck('q', 'n'))
+        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>bdelete<CR>", '<silent> <unique>')
     endif
   endif
   return ''
 endfunction
 
+function! s:TempDelete(file) abort
+  let key = s:cpath(a:file)
+  if has_key(s:temp_files, key) && !has_key(s:temp_files[key], 'job') && key !=# s:cpath(get(get(g:, '_fugitive_last_job', {}), 'file', ''))
+    call delete(a:file)
+    call remove(s:temp_files, key)
+  endif
+  return ''
+endfunction
+
 augroup fugitive_temp
   autocmd!
   autocmd BufReadPre  * exe s:TempReadPre( expand('<amatch>:p'))
   autocmd BufReadPost * exe s:TempReadPost(expand('<amatch>:p'))
+  autocmd BufWipeout  * exe s:TempDelete(  expand('<amatch>:p'))
 augroup END
 
 " Section: :Git
 
 function! s:AskPassArgs(dir) abort
-  if (len($DISPLAY) || len($TERM_PROGRAM) || has('gui_running')) && fugitive#GitVersion(1, 8) &&
+  if (len($DISPLAY) || len($TERM_PROGRAM) || has('gui_running')) &&
         \ empty($GIT_ASKPASS) && empty($SSH_ASKPASS) && empty(FugitiveConfigGetAll('core.askpass', a:dir))
     if s:executable(s:ExecPath() . '/git-gui--askpass')
       return ['-c', 'core.askPass=' . s:ExecPath() . '/git-gui--askpass']
@@ -2280,20 +2745,29 @@ function! s:AskPassArgs(dir) abort
 endfunction
 
 function! s:RunJobs() abort
-  return exists('*job_start') || exists('*jobstart')
+  return (exists('*job_start') || exists('*jobstart')) && exists('*bufwinid')
 endfunction
 
-function! s:RunEdit(state, job) abort
-  if get(a:state, 'request', '') == 'edit'
-    call remove(a:state, 'request')
-    let file = readfile(a:state.temp . '.edit')[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:job]
-    return 1
+function! s:RunSave(state) abort
+  let s:temp_files[s:cpath(a:state.file)] = a:state
+endfunction
+
+function! s:RunFinished(state, ...) abort
+  if has_key(get(g:, '_fugitive_last_job', {}), 'file') && bufnr(g:_fugitive_last_job.file) < 0
+    exe s:TempDelete(remove(g:, '_fugitive_last_job').file)
   endif
+  let g:_fugitive_last_job = a:state
+  let first = join(readfile(a:state.file, '', 2), "\n")
+  if get(a:state, 'filetype', '') ==# 'git' && first =~# '\<\([[:upper:][:digit:]_-]\+(\d\+)\).*\1'
+    let a:state.filetype = 'man'
+  endif
+  if !has_key(a:state, 'capture_bufnr')
+    return
+  endif
+  call fugitive#ReloadStatus(a:state, 1)
 endfunction
 
+<<<<<<< HEAD
 function! s:RunReceive(state, type, job, data, ...) abort
   call add(a:state.log, a:data)
   let data = type(a:data) == type([]) ? join(a:data, "\n") : a:data
@@ -2303,19 +2777,124 @@ function! s:RunReceive(state, type, job, data, ...) abort
     let a:state.escape_buffer = matchstr(data, escape . '$')
     if len(a:state.escape_buffer)
       let data = strpart(data, 0, len(data) - len(a:state.escape_buffer))
+=======
+function! s:RunEdit(state, tmp, job) abort
+  if get(a:state, 'request', '') !=# 'edit'
+    return 0
+  endif
+  call remove(a:state, 'request')
+  let sentinel = a:state.file . '.edit'
+  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)
+  return 1
+endfunction
+
+function! s:RunReceive(state, tmp, type, job, data, ...) abort
+  if a:type ==# 'err' || a:state.pty
+    let data = type(a:data) == type([]) ? join(a:data, "\n") : a:data
+    let data = a:tmp.escape . data
+    let escape = "\033]51;[^\007]*"
+    let a:tmp.escape = matchstr(data, escape . '$')
+    if len(a:tmp.escape)
+      let data = strpart(data, 0, len(data) - len(a:tmp.escape))
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     endif
     let cmd = matchstr(data, escape . "\007")[5:-2]
     let data = substitute(data, escape . "\007", '', 'g')
     if cmd =~# '^fugitive:'
       let a:state.request = strpart(cmd, 9)
     endif
+<<<<<<< HEAD
+=======
+    let lines = split(a:tmp.err . data, "\r\\=\n", 1)
+    let a:tmp.err = lines[-1]
+    let lines[-1] = ''
+    call map(lines, 'substitute(v:val, ".*\r", "", "")')
+  else
+    let lines = type(a:data) == type([]) ? a:data : split(a:data, "\n", 1)
+    if len(a:tmp.out)
+      let lines[0] = a:tmp.out . lines[0]
+    endif
+    let a:tmp.out = lines[-1]
+    let lines[-1] = ''
   endif
-  let data = a:state.echo_buffer . data
-  let a:state.echo_buffer = matchstr(data, "[\r\n]\\+$")
-  if len(a:state.echo_buffer)
-    let data = strpart(data, 0, len(data) - len(a:state.echo_buffer))
+  call writefile(lines, a:state.file, 'ba')
+  if has_key(a:tmp, 'echo')
+    if !exists('l:data')
+      let data = type(a:data) == type([]) ? join(a:data, "\n") : a:data
+    endif
+    let a:tmp.echo .= data
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   endif
-  echon substitute(data, "\r\\ze\n", '', 'g')
+  let line_count = a:tmp.line_count
+  let a:tmp.line_count += len(lines) - 1
+  if !has_key(a:state, 'capture_bufnr') || !bufloaded(a:state.capture_bufnr)
+    return
+  endif
+  call remove(lines, -1)
+  try
+    call setbufvar(a:state.capture_bufnr, '&modifiable', 1)
+    if !line_count && len(lines) > 1000
+      let first = remove(lines, 0, 999)
+      call setbufline(a:state.capture_bufnr, 1, first)
+      redraw
+      call setbufline(a:state.capture_bufnr, 1001, lines)
+    else
+      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
+      let winnr = bufwinnr(a:state.capture_bufnr)
+      if winnr > 0
+        let old_winnr = winnr()
+        exe 'noautocmd' winnr.'wincmd w'
+        $
+        exe 'noautocmd' old_winnr.'wincmd w'
+      endif
+    endif
+  catch
+  endtry
+endfunction
+
+function! s:RunExit(state, tmp, job, exit_status) abort
+  let a:state.exit_status = a:exit_status
+  if has_key(a:state, 'job')
+    return
+  endif
+  call s:RunFinished(a:state)
+endfunction
+
+function! s:RunClose(state, tmp, job, ...) abort
+  if a:0
+    call s:RunExit(a:state, a:tmp, a:job, a:1)
+  endif
+  let noeol = substitute(substitute(a:tmp.err, "\r$", '', ''), ".*\r", '', '') . a:tmp.out
+  call writefile([noeol], a:state.file, 'ba')
+  call remove(a:state, 'job')
+  if has_key(a:state, 'capture_bufnr') && bufloaded(a:state.capture_bufnr)
+    if len(noeol)
+      call setbufvar(a:state.capture_bufnr, '&modifiable', 1)
+      call setbufline(a:state.capture_bufnr, a:tmp.line_count + 1, [noeol])
+      call setbufvar(a:state.capture_bufnr, '&eol', 0)
+      call setbufvar(a:state.capture_bufnr, '&modifiable', 0)
+    endif
+    call setbufvar(a:state.capture_bufnr, '&modified', 0)
+    call setbufvar(a:state.capture_bufnr, '&buflisted', 0)
+    if a:state.filetype !=# getbufvar(a:state.capture_bufnr, '&filetype', '')
+      call setbufvar(a:state.capture_bufnr, '&filetype', a:state.filetype)
+    endif
+  endif
+  if !has_key(a:state, 'exit_status')
+    return
+  endif
+  call s:RunFinished(a:state)
 endfunction
 
 function! s:RunSend(job, str) abort
@@ -2331,27 +2910,75 @@ function! s:RunSend(job, str) abort
   endtry
 endfunction
 
+function! s:RunCloseIn(job) abort
+  try
+    if type(a:job) ==# type(0)
+      call chanclose(a:job, 'stdin')
+    else
+      call ch_close_in(a:job)
+    endif
+    return 1
+  catch /^Vim\%((\a\+)\)\=:E90[06]:/
+    return 0
+  endtry
+endfunction
+
+function! s:RunEcho(tmp) abort
+  if !has_key(a:tmp, 'echo')
+    return
+  endif
+  let data = a:tmp.echo
+  let a:tmp.echo = matchstr(data, "[\r\n]\\+$")
+  if len(a:tmp.echo)
+    let data = strpart(data, 0, len(data) - len(a:tmp.echo))
+  endif
+  echon substitute(data, "\r\\ze\n", '', 'g')
+endfunction
+
+function! s:RunTick(job) abort
+  if type(a:job) == v:t_number
+    return jobwait([a:job], 1)[0] == -1
+  elseif type(a:job) == 8
+    let running = ch_status(a:job) !~# '^closed$\|^failed$' || job_status(a:job) ==# 'run'
+    sleep 1m
+    return running
+  endif
+endfunction
+
 if !exists('s:edit_jobs')
   let s:edit_jobs = {}
 endif
-function! s:RunWait(state, job) abort
-  let finished = 0
+function! s:RunWait(state, tmp, job, ...) abort
+  if a:0 && filereadable(a:1)
+    call delete(a:1)
+  endif
   try
-    while get(a:state, 'request', '') !=# 'edit' && (type(a:job) == type(0) ? jobwait([a:job], 1)[0] == -1 : ch_status(a:job) !=# 'closed' || job_status(a:job) ==# 'run')
-      if !exists('*jobwait')
-        sleep 1m
-      endif
-      if !get(a:state, 'closed')
+    while get(a:state, 'request', '') !=# 'edit' && s:RunTick(a:job)
+      call s:RunEcho(a:tmp)
+      if !get(a:state, '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>"
-            let a:state.closed = 1
-            if type(a:job) ==# type(0)
-              call chanclose(a:job, 'stdin')
-            else
-              call ch_close_in(a:job)
+          if c ==# "\<C-D>" || c ==# "\<Esc>"
+            let a:state.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')
+                let can_pedit = 0
+              endif
+            endfor
+            if can_pedit
+              if has_key(a:tmp, 'echo')
+                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)
+              let a:state.capture_bufnr = bufnr(a:state.file)
+              call setbufvar(a:state.capture_bufnr, '&modified', 1)
+              let finished = 0
+              redraw!
+              return ''
             endif
           else
             call s:RunSend(a:job, c)
@@ -2362,14 +2989,19 @@ function! s:RunWait(state, job) abort
         endif
       endif
     endwhile
-    sleep 1m
-    echo
-    call s:RunEdit(a:state, a:job)
-    let finished = 1
+    if !has_key(a:state, 'request') && has_key(a:state, 'job') && exists('*job_status') && job_status(a:job) ==# "dead"
+      throw 'fugitive: close callback did not fire; this should never happen'
+    endif
+    call s:RunEcho(a:tmp)
+    if has_key(a:tmp, 'echo')
+      let a:tmp.echo = substitute(a:tmp.echo, "^\r\\=\n", '', '')
+      echo
+    endif
+    let finished = !s:RunEdit(a:state, a:tmp, a:job)
   finally
-    if !finished
+    if !exists('finished')
       try
-        if a:state.pty
+        if a:state.pty && !get(a:state, 'closed_in')
           call s:RunSend(a:job, "\<C-C>")
         elseif type(a:job) == type(0)
           call jobstop(a:job)
@@ -2378,9 +3010,10 @@ function! s:RunWait(state, job) abort
         endif
       catch /.*/
       endtry
+    elseif finished
+      call fugitive#ReloadStatus(a:state, 1)
     endif
   endtry
-  call fugitive#ReloadStatus(a:state.dir, 1)
   return ''
 endfunction
 
@@ -2389,27 +3022,39 @@ if !exists('s:resume_queue')
 endif
 function! fugitive#Resume() abort
   while len(s:resume_queue)
-    let [state, job] = remove(s:resume_queue, 0)
-    if filereadable(state.temp . '.edit')
-      call delete(state.temp . '.edit')
+    if s:resume_queue[0][2] isnot# ''
+      try
+        call call('s:RunWait', remove(s:resume_queue, 0))
+      endtry
     endif
-    call s:RunWait(state, job)
   endwhile
 endfunction
 
 function! s:RunBufDelete(bufnr) abort
+  let state = s:TempState(bufname(+a:bufnr))
+  if has_key(state, 'job')
+    try
+      if type(state.job) == type(0)
+        call jobstop(state.job)
+      else
+        call job_stop(state.job)
+      endif
+    catch
+    endtry
+  endif
   if has_key(s:edit_jobs, a:bufnr) |
     call add(s:resume_queue, remove(s:edit_jobs, a:bufnr))
-    call feedkeys(":redraw!|call fugitive#Resume()|silent checktime\r", 'n')
+    call feedkeys(":redraw!|call delete(" . string(s:resume_queue[-1][0].file . '.edit') .
+          \ ")|call fugitive#Resume()|silent checktime\r", 'n')
   endif
 endfunction
 
 augroup fugitive_job
   autocmd!
-  autocmd BufDelete * call s:RunBufDelete(expand('<abuf>'))
+  autocmd BufDelete * call s:RunBufDelete(+expand('<abuf>'))
   autocmd VimLeave *
         \ for s:jobbuf in keys(s:edit_jobs) |
-        \   call writefile([], s:edit_jobs[s:jobbuf][0].temp . '.exit') |
+        \   call writefile(['Aborting edit due to Vim exit.'], s:edit_jobs[s:jobbuf][0].file . '.exit') |
         \   redraw! |
         \   call call('s:RunWait', remove(s:edit_jobs, s:jobbuf)) |
         \ endfor
@@ -2438,8 +3083,9 @@ function! fugitive#PagerFor(argv, ...) abort
     return 0
   elseif type(value) == type('')
     return value
-  elseif args[0] =~# 'diff\%(tool\)\@!\|log\|^show$\|^config$\|^branch$\|^tag$' ||
+  elseif args[0] =~# '^\%(branch\|config\|diff\|grep\|log\|range-diff\|shortlog\|show\|tag\|whatchanged\)$' ||
         \ (args[0] ==# 'stash' && get(args, 1, '') ==# 'show') ||
+        \ (args[0] ==# 'reflog' && get(args, 1, '') !~# '^\%(expire\|delete\|exists\)$') ||
         \ (args[0] ==# 'am' && s:HasOpt(args, '--show-current-patch'))
     return 1
   else
@@ -2453,6 +3099,7 @@ for s:colortype in ['advice', 'branch', 'diff', 'grep', 'interactive', 'pager',
 endfor
 unlet s:colortype
 function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
+  exe s:VersionCheck()
   let dir = s:Dir()
   let config = copy(fugitive#Config(dir))
   let [args, after] = s:SplitExpandChain(a:arg, s:Tree(dir))
@@ -2482,18 +3129,18 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
     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 = fugitive#Config('alias.' . get(args, 0, ''), config)
+  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 = split(get(g:, 'fugitive_git_command', g:fugitive_git_executable), '\s\+')
+  let git = s:UserCommandList()
   let options = {'git': git, 'dir': dir, 'flags': flags}
-  if pager is# -1 && exists('*s:' . name . 'Subcommand') && get(args, 1, '') !=# '--help'
+  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({'command': args[0], 'args': args[1:-1]}, options))
+      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
@@ -2534,43 +3181,58 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
       return 'echoerr ' .  string('fugitive: :Git! for temp buffer output has been replaced by :Git --paginate')
     endif
   endif
-  if pager is# 1
-    if editcmd ==# 'read'
-      return s:ReadExec(a:line1, a:line2, a:range, a:mods, env, args, options) . after
-    else
-      return s:OpenExec(editcmd, a:mods, env, args, options) . after
-    endif
-  endif
-  if s:HasOpt(args, ['add', 'checkout', 'commit', 'stage', 'stash', 'reset'], '-p', '--patch') ||
+  if (s:HasOpt(args, ['add', 'checkout', 'commit', 'stage', 'stash', 'reset'], '-p', '--patch') ||
         \ s:HasOpt(args, ['add', 'clean', 'stage'], '-i', '--interactive') ||
-        \ type(pager) == type('')
+        \ type(pager) == type('')) && pager isnot# 1
     let mods = substitute(s:Mods(a:mods), '\<tab\>', '-tab', 'g')
     let assign = len(dir) ? '|let b:git_dir = ' . string(dir) : ''
     if has('nvim')
-      if &autowrite || &autowriteall | silent! wall | endif
+      call fugitive#Autowrite()
       return mods . (a:line2 ? 'split' : 'edit') . ' term://' . s:fnameescape(s:UserCommand(options, args)) . assign . '|startinsert' . after
     elseif has('terminal')
-      if &autowrite || &autowriteall | silent! wall | endif
+      call fugitive#Autowrite()
       return 'exe ' . string(mods . 'terminal ' . (a:line2 ? '' : '++curwin ') . join(map(s:UserCommandList(options) + args, 's:fnameescape(v:val)'))) . assign . after
     endif
   endif
-  if s:RunJobs()
-    let state = {
-          \ 'dir': dir,
-          \ 'mods': s:Mods(a:mods),
-          \ 'title': ':Git ' . a:arg,
-          \ 'echo_buffer': '',
-          \ 'escape_buffer': '',
-          \ 'log': [],
-          \ 'temp': tempname()}
-    let state.pty = get(g:, 'fugitive_pty', has('unix') && (has('patch-8.0.0744') || has('nvim')))
+  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,
+        \ 'flags': flags,
+        \ 'args': args,
+        \ 'dir': dir,
+        \ 'git_dir': dir,
+        \ 'cwd': s:UserCommandCwd(dir),
+        \ 'filetype': 'git',
+        \ 'mods': s:Mods(a:mods),
+        \ 'file': s:Resolve(tempname())}
+  if pager is# 1
+    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 !state.pty
       let args = s:AskPassArgs(dir) + args
     endif
+<<<<<<< HEAD
     let env.FUGITIVE_TEMP = state.temp
     let env.FUGITIVE = state.temp
     let editor = 'sh ' . s:TempScript(
           \ '[ -f "$FUGITIVE.exit" ] && exit 1',
+=======
+    let tmp = {
+          \ 'line_count': 0,
+          \ 'err': '',
+          \ 'out': '',
+          \ 'echo': '',
+          \ 'escape': ''}
+    let env.FUGITIVE = state.file
+    let editor = 'sh ' . s:TempScript(
+          \ '[ -f "$FUGITIVE.exit" ] && cat "$FUGITIVE.exit" >&2 && exit 1',
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
           \ 'echo "$1" > "$FUGITIVE.edit"',
           \ 'printf "\033]51;fugitive:edit\007" >&2',
           \ 'while [ -f "$FUGITIVE.edit" -a ! -f "$FUGITIVE.exit" ]; do sleep 0.05 2>/dev/null || sleep 1; done',
@@ -2585,14 +3247,22 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
     let args = s:disable_colors + flags + ['-c', 'advice.waitingForEditor=false'] + args
     let argv = s:UserCommandList({'git': git, 'dir': dir}) + args
     let [argv, jobopts] = s:JobOpts(argv, env)
-    let state.cmd = argv
-    let g:_fugitive_last_job = state
-    if &autowrite || &autowriteall | silent! wall | endif
+    call fugitive#Autowrite()
+    call writefile([], state.file, 'b')
+    call s:RunSave(state)
+    echo ""
     if exists('*job_start')
       call extend(jobopts, {
             \ 'mode': 'raw',
+<<<<<<< HEAD
             \ 'out_cb': function('s:RunReceive', [state, 'out']),
             \ 'err_cb': function('s:RunReceive', [state, 'err']),
+=======
+            \ 'out_cb': function('s:RunReceive', [state, tmp, 'out']),
+            \ 'err_cb': function('s:RunReceive', [state, tmp, 'err']),
+            \ 'close_cb': function('s:RunClose', [state, tmp]),
+            \ 'exit_cb': function('s:RunExit', [state, tmp]),
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
             \ })
       if state.pty
         let jobopts.pty = 1
@@ -2602,13 +3272,42 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
       let job = jobstart(argv, extend(jobopts, {
             \ 'pty': state.pty,
             \ 'TERM': 'dumb',
+<<<<<<< HEAD
             \ 'on_stdout': function('s:RunReceive', [state, 'out']),
             \ 'on_stderr': function('s:RunReceive', [state, 'err']),
+=======
+            \ 'on_stdout': function('s:RunReceive', [state, tmp, 'out']),
+            \ 'on_stderr': function('s:RunReceive', [state, tmp, 'err']),
+            \ 'on_exit': function('s:RunClose', [state, tmp]),
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
             \ }))
     endif
     let state.job = job
-    call s:RunWait(state, job)
-    return 'silent checktime' . after
+    call add(s:resume_queue, [state, tmp, job])
+    return 'call fugitive#Resume()|silent checktime' . after
+  elseif pager is# 1
+    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), '!#%') .
+            \ (&shell =~# 'csh' ? ' >& ' . s:shellesc(state.file) : ' > ' . s:shellesc(state.file) . ' 2>&1')
+      let state.exit_status = v:shell_error
+    finally
+      if exists('guioptions')
+        let &guioptions = guioptions
+      endif
+    endtry
+    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
   elseif has('win32')
     return 'echoerr ' . string('fugitive: Vim 8 with job support required to use :Git on Windows')
   elseif has('gui_running')
@@ -2623,28 +3322,75 @@ endfunction
 
 let s:exec_paths = {}
 function! s:ExecPath() abort
-  if !has_key(s:exec_paths, g:fugitive_git_executable)
-    let s:exec_paths[g:fugitive_git_executable] = s:sub(system(g:fugitive_git_executable.' --exec-path'),'\n$','')
+  let git = s:GitShellCmd()
+  if !has_key(s:exec_paths, git)
+    let s:exec_paths[git] = s:sub(system(git.' --exec-path'),'\n$','')
   endif
-  return s:exec_paths[g:fugitive_git_executable]
+  return s:exec_paths[git]
 endfunction
 
-function! s:Subcommands() abort
-  let exec_path = s:ExecPath()
-  return map(split(glob(exec_path.'/git-*'),"\n"),'s:sub(v:val[strlen(exec_path)+5 : -1],"\\.exe$","")')
-endfunction
-
-let s:aliases = {}
-function! s:Aliases(dir) abort
-  let dir_key = len(a:dir) ? a:dir : '_'
-  if !has_key(s:aliases, dir_key)
-    let s:aliases[dir_key] = {}
-    let lines = s:NullError([a:dir, 'config', '-z', '--get-regexp', '^alias[.]'])[0]
-    for line in lines
-      let s:aliases[dir_key][matchstr(line, '\.\zs.\{-}\ze\n')] = matchstr(line, '\n\zs.*')
-    endfor
+let s:subcommands_before_2_5 = [
+      \ 'add', 'am', 'apply', 'archive', 'bisect', 'blame', 'branch', 'bundle',
+      \ 'checkout', 'cherry', 'cherry-pick', 'citool', 'clean', 'clone', 'commit', 'config',
+      \ 'describe', 'diff', 'difftool', 'fetch', 'format-patch', 'fsck',
+      \ 'gc', 'grep', 'gui', 'help', 'init', 'instaweb', 'log',
+      \ 'merge', 'mergetool', 'mv', 'notes', 'pull', 'push',
+      \ 'rebase', 'reflog', 'remote', 'repack', 'replace', 'request-pull', 'reset', 'revert', 'rm',
+      \ 'send-email', 'shortlog', 'show', 'show-branch', 'stash', 'stage', 'status', 'submodule',
+      \ 'tag', 'whatchanged',
+      \ ]
+let s:path_subcommands = {}
+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')
+      call filter(lines, 'v:val =~# "^\\S\\+$"')
+      if !exec_error && len(lines)
+        let s:path_subcommands[c_exec_path] = lines
+      else
+        let s:path_subcommands[c_exec_path] = s:subcommands_before_2_5 +
+              \ ['maintenance', 'prune', 'range-diff', 'restore', 'sparse-checkout', 'switch', 'worktree']
+      endif
+    else
+      let s:path_subcommands[c_exec_path] = s:subcommands_before_2_5 +
+            \ (fugitive#GitVersion(2, 5) ? ['worktree'] : [])
+    endif
+  endif
+  let commands = copy(s:path_subcommands[c_exec_path])
+  for path in split($PATH, has('win32') ? ';' : ':')
+    if path !~# '^/\|^\a:[\\/]'
+      continue
+    endif
+    let cpath = s:cpath(path)
+    if !has_key(s:path_subcommands, cpath)
+      let s:path_subcommands[cpath] = filter(map(s:GlobComplete(path.'/git-', '*', 1),'substitute(v:val,"\\.exe$","","")'), 'v:val !~# "--\\|/"')
+    endif
+    call extend(commands, s:path_subcommands[cpath])
+  endfor
+  call extend(commands, keys(FugitiveConfigGetRegexp('^alias\.\zs[^.]\+$', a:dir)))
+  let configured = split(FugitiveConfigGet('completion.commands', a:dir), '\s\+')
+  let rejected = {}
+  for command in configured
+    if command =~# '^-.'
+      let rejected[strpart(command, 1)] = 1
+    endif
+  endfor
+  call filter(configured, 'v:val !~# "^-"')
+  let results = filter(sort(commands + configured), '!has_key(rejected, v:val)')
+  if exists('*uniq')
+    return uniq(results)
+  else
+    let i = 1
+    while i < len(results)
+      if results[i] ==# results[i-1]
+        call remove(results, i)
+      else
+        let i += 1
+      endif
+    endwhile
+    return results
   endif
-  return s:aliases[dir_key]
 endfunction
 
 function! fugitive#Complete(lead, ...) abort
@@ -2653,7 +3399,7 @@ function! fugitive#Complete(lead, ...) abort
   let pre = a:0 > 1 ? strpart(a:1, 0, a:2) : ''
   let subcmd = matchstr(pre, '\u\w*[! ] *\zs[[:alnum:]-]\+\ze ')
   if empty(subcmd)
-    let results = sort(s:Subcommands() + keys(s:Aliases(dir)))
+    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, '')
     let caps_subcmd = substitute(subcmd, '\%(^\|-\)\l', '\u&', 'g')
@@ -2697,8 +3443,9 @@ function! s:StatusCommand(line1, line2, range, count, bang, mods, reg, arg, args
   try
     let mods = s:Mods(a:mods, &splitbelow ? 'botright' : 'topleft')
     let file = fugitive#Find(':', dir)
-    let arg = ' +setl\ foldmethod=syntax\ foldlevel=1\|let\ w:fugitive_status=FugitiveGitDir() ' .
+    let arg = ' +setl\ foldmarker=<<<<<<<<,>>>>>>>>\|let\ w:fugitive_status=FugitiveGitDir() ' .
           \ s:fnameescape(file)
+<<<<<<< HEAD
     for winnr in range(1, winnr('$'))
       if s:cpath(file, fnamemodify(bufname(winbufnr(winnr)), ':p'))
         if winnr == winnr()
@@ -2711,6 +3458,24 @@ function! s:StatusCommand(line1, line2, range, count, bang, mods, reg, arg, args
         1
         return ''
       endif
+=======
+    for tabnr in [tabpagenr()] + (mods =~# '\<tab\>' ? range(1, tabpagenr('$')) : [])
+      let bufs = tabpagebuflist(tabnr)
+      for winnr in range(1, tabpagewinnr(tabnr, '$'))
+        if s:cpath(file, fnamemodify(bufname(bufs[winnr-1]), ':p'))
+          if tabnr == tabpagenr() && winnr == winnr()
+            call s:ReloadStatus()
+          else
+            call s:ExpireStatus(dir)
+            exe tabnr . 'tabnext'
+            exe winnr . 'wincmd w'
+          endif
+          let w:fugitive_status = dir
+          1
+          return ''
+        endif
+      endfor
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
     endfor
     if a:count ==# 0
       return mods . 'edit' . (a:bang ? '!' : '') . arg
@@ -2753,10 +3518,10 @@ endfunction
 
 function! s:StageSeek(info, fallback) abort
   let info = a:info
-  if empty(info.section)
+  if empty(info.heading)
     return a:fallback
   endif
-  let line = search('^' . info.section, 'wn')
+  let line = search('^' . escape(substitute(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')
@@ -2817,9 +3582,12 @@ function! s:DoAutocmdChanged(dir) abort
   endif
   try
     let g:fugitive_event = dir
+    if type(a:dir) == type({}) && has_key(a:dir, 'args')
+      let g:fugitive_result = a:dir
+    endif
     exe s:DoAutocmd('User FugitiveChanged')
   finally
-    unlet! g:fugitive_event
+    unlet! g:fugitive_event g:fugitive_result
     " Force statusline reload with the buffer's Git dir
     let &ro = &ro
   endtry
@@ -2833,8 +3601,7 @@ function! s:ReloadStatusBuffer(...) abort
   let original_lnum = a:0 ? a:1 : line('.')
   let info = s:StageInfo(original_lnum)
   call fugitive#BufReadStatus()
-  exe s:StageSeek(info, original_lnum)
-  normal! 0
+  call setpos('.', [0, s:StageSeek(info, original_lnum), 1, 0])
   return ''
 endfunction
 
@@ -2851,7 +3618,16 @@ if !exists('s:last_times')
 endif
 
 function! s:ExpireStatus(bufnr) abort
+<<<<<<< HEAD
   if a:bufnr == -2
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+=======
+  if a:bufnr is# -2
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     let s:head_cache = {}
     let s:last_time = reltime()
     return ''
@@ -2884,7 +3660,8 @@ endfunction
 function! s:ReloadTabStatus(...) abort
   let mytab = tabpagenr()
   let tab = a:0 ? a:1 : mytab
-  for winnr in range(1, tabpagewinnr(tab, '$'))
+  let winnr = 1
+  while winnr <= tabpagewinnr(tab, '$')
     if getbufvar(tabpagebuflist(tab)[winnr-1], 'fugitive_type') ==# 'index'
       execute 'tabnext '.tab
       if winnr != winnr()
@@ -2901,7 +3678,8 @@ function! s:ReloadTabStatus(...) abort
         execute 'tabnext '.mytab
       endtry
     endif
-  endfor
+    let winnr += 1
+  endwhile
   unlet! t:fugitive_reload_status
 endfunction
 
@@ -2914,10 +3692,11 @@ function! fugitive#ReloadStatus(...) abort
       call settabvar(tabnr, 'fugitive_reload_status', t)
     endfor
     call s:ReloadTabStatus()
-    exe s:DoAutocmdChanged(a:0 ? a:1 : -1)
   else
     call s:ReloadWinStatus()
+    return ''
   endif
+  exe s:DoAutocmdChanged(a:0 ? a:1 : -1)
   return ''
 endfunction
 
@@ -2990,7 +3769,7 @@ function! s:StageInfo(...) abort
         \ 'paths': map(reverse(split(text, ' -> ')), 's:Tree() . "/" . v:val'),
         \ 'commit': matchstr(getline(lnum), '^\%(\%(\x\x\x\)\@!\l\+\s\+\)\=\zs[0-9a-f]\{4,\}\ze '),
         \ 'status': matchstr(getline(lnum), '^[A-Z?]\ze \|^\%(\x\x\x\)\@!\l\+\ze [0-9a-f]'),
-        \ 'sub': get(get(get(b:fugitive_files, section, {}), text, {}), 'sub', ''),
+        \ 'submodule': get(get(get(b:fugitive_files, section, {}), text, {}), 'submodule', ''),
         \ 'index': index}
 endfunction
 
@@ -3358,7 +4137,9 @@ function! s:StageInline(mode, ...) abort
   endif
   let lnum1 = a:0 ? a:1 : line('.')
   let lnum = lnum1 + 1
-  if a:0 > 1 && a:2 == 0
+  if a:0 > 1 && a:2 == 0 && lnum1 == 1
+    let lnum = line('$') - 1
+  elseif a:0 > 1 && a:2 == 0
     let info = s:StageInfo(lnum - 1)
     if empty(info.paths) && len(info.section)
       while len(getline(lnum))
@@ -3425,6 +4206,9 @@ function! s:StageInline(mode, ...) abort
       silent call append(lnum, diff)
       let b:fugitive_expanded[info.section][info.filename] = [start, len(diff)]
       setlocal nomodifiable readonly nomodified
+      if foldclosed(lnum+1) > 0
+        silent exe (lnum+1) . ',' . (lnum+len(diff)) . 'foldopen!'
+      endif
     endif
   endwhile
   return lnum
@@ -3442,10 +4226,20 @@ function! s:StageDiff(diff) abort
   let lnum = line('.')
   let info = s:StageInfo(lnum)
   let prefix = info.offset > 0 ? '+' . info.offset : ''
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+  if empty(info.paths) && info.section ==# 'Staged'
+=======
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   if info.sub =~# '^S'
+=======
+  if info.submodule =~# '^S'
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
     if info.section ==# 'Staged'
       return 'Git --paginate diff --no-ext-diff --submodule=log --cached -- ' . info.paths[0]
-    elseif info.sub =~# '^SC'
+    elseif info.submodule =~# '^SC'
       return 'Git --paginate diff --no-ext-diff --submodule=log -- ' . info.paths[0]
     else
       return 'Git --paginate diff --no-ext-diff --submodule=diff -- ' . info.paths[0]
@@ -3456,7 +4250,29 @@ function! s:StageDiff(diff) abort
     return 'Git --paginate diff --no-ext-diff'
   elseif len(info.paths) > 1
     execute 'Gedit' . prefix s:fnameescape(':0:' . info.paths[0])
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+    return a:diff.' HEAD:'.s:fnameescape(info.paths[1])
+  elseif info.section ==# 'Staged' && info.sigil ==# '-'
+    execute 'Gedit' prefix s:fnameescape('@:'.info.paths[0])
+    return a:diff.'! :0:%'
+  elseif info.section ==# 'Staged'
+    execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
+    return a:diff . (info.sigil ==# '+' ? '!' : '') . ' @:%'
+  elseif info.sigil ==# '-'
+    execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
+    return a:diff . '!'
+  else
+    execute 'Gedit' prefix s:fnameescape(':(top)'.info.paths[0])
+    return a:diff . (info.sigil ==# '+' ? '!' : '')
+=======
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     return a:diff . '! HEAD:'.s:fnameescape(info.paths[1])
+=======
+    return a:diff . '! @:'.s:fnameescape(info.paths[1])
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
   elseif info.section ==# 'Staged' && info.sigil ==# '-'
     execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
     return a:diff . '! :0:%'
@@ -3487,7 +4303,7 @@ endfunction
 
 function! s:StageApply(info, reverse, extra) abort
   if a:info.status ==# 'R'
-    call s:throw('fugitive: patching renamed file not yet supported')
+    throw 'fugitive: patching renamed file not yet supported'
   endif
   let cmd = ['apply', '-p0', '--recount'] + a:extra
   let info = a:info
@@ -3497,9 +4313,9 @@ function! s:StageApply(info, reverse, extra) abort
   if empty(filter(copy(lines), 'v:val =~# "^[+-]"'))
     return -1
   endif
-  while getline(end) =~# '^[-+ ]'
+  while getline(end) =~# '^[-+\ ]'
     let end += 1
-    if getline(end) =~# '^[' . (a:reverse ? '+' : '-') . ' ]'
+    if getline(end) =~# '^[' . (a:reverse ? '+' : '-') . '\ ]'
       call add(lines, ' ' . getline(end)[1:-1])
     endif
   endwhile
@@ -3512,7 +4328,7 @@ function! s:StageApply(info, reverse, extra) abort
     endif
   endwhile
   if start == 0
-    throw 'fugitive: cold not find hunk'
+    throw 'fugitive: could not find hunk'
   elseif getline(start) !~# '^@@ '
     throw 'fugitive: cannot apply conflict hunk'
   endif
@@ -3543,28 +4359,22 @@ endfunction
 
 function! s:StageDelete(lnum1, lnum2, count) abort
   let restore = []
+
   let err = ''
+  let did_conflict_err = 0
   try
     for info in s:Selection(a:lnum1, a:lnum2)
       if empty(info.paths)
         continue
       endif
-      let sub = get(get(get(b:fugitive_files, info.section, {}), info.filename, {}), 'sub')
-      if sub =~# '^S'
-        if info.status ==# 'A'
-          continue
-        endif
-        if info.section ==# 'Staged'
-          call s:TreeChomp('reset', '--', info.paths[0])
-        endif
-        if info.status =~# '[MD]'
-          call s:TreeChomp('submodule', 'update', '--', info.paths[0])
-          call add(restore, ':Git -C ' . info.relative[0] . ' checkout -')
-        endif
-        continue
-      endif
-      if info.status ==# 'D'
-        let undo = 'Gremove'
+      let sub = get(get(get(b:fugitive_files, info.section, {}), info.filename, {}), 'submodule')
+      if sub =~# '^S' && info.status ==# 'M'
+        let undo = 'Git checkout ' . fugitive#RevParse('HEAD', FugitiveExtractGitDir(info.paths[0]))[0:10] . ' --'
+      elseif sub =~# '^S'
+        let err .= '|echoerr ' . string('fugitive: will not touch submodule ' . string(info.relative[0]))
+        break
+      elseif info.status ==# 'D'
+        let undo = 'GRemove'
       elseif info.paths[0] =~# '/$'
         let err .= '|echoerr ' . string('fugitive: will not delete directory ' . string(info.relative[0]))
         break
@@ -3573,25 +4383,48 @@ function! s:StageDelete(lnum1, lnum2, count) abort
       endif
       if info.patch
         call s:StageApply(info, 1, info.section ==# 'Staged' ? ['--index'] : [])
+      elseif sub =~# '^S'
+        if info.section ==# 'Staged'
+          call s:TreeChomp('reset', '--', info.paths[0])
+        endif
+        call s:TreeChomp('submodule', 'update', '--', info.paths[0])
       elseif info.status ==# '?'
         call s:TreeChomp('clean', '-f', '--', info.paths[0])
       elseif a:count == 2
-        call s:TreeChomp('checkout', '--ours', '--', info.paths[0])
+        if get(b:fugitive_files['Staged'], info.filename, {'status': ''}).status ==# 'D'
+          call delete(FugitiveVimPath(info.paths[0]))
+        else
+          call s:TreeChomp('checkout', '--ours', '--', info.paths[0])
+        endif
       elseif a:count == 3
-        call s:TreeChomp('checkout', '--theirs', '--', info.paths[0])
+        if get(b:fugitive_files['Unstaged'], info.filename, {'status': ''}).status ==# 'D'
+          call delete(FugitiveVimPath(info.paths[0]))
+        else
+          call s:TreeChomp('checkout', '--theirs', '--', info.paths[0])
+        endif
       elseif info.status =~# '[ADU]' &&
             \ get(b:fugitive_files[info.section ==# 'Staged' ? 'Unstaged' : 'Staged'], info.filename, {'status': ''}).status =~# '[AU]'
-        call s:TreeChomp('checkout', info.section ==# 'Staged' ? '--ours' : '--theirs', '--', info.paths[0])
+        if get(g:, 'fugitive_conflict_x', 0)
+          call s:TreeChomp('checkout', info.section ==# 'Unstaged' ? '--ours' : '--theirs', '--', info.paths[0])
+        else
+          if !did_conflict_err
+            let err .= '|echoerr "Use 2X for --ours or 3X for --theirs"'
+            let did_conflict_err = 1
+          endif
+          continue
+        endif
       elseif info.status ==# 'U'
-        call s:TreeChomp('rm', '--', info.paths[0])
+        call delete(FugitiveVimPath(info.paths[0]))
       elseif info.status ==# 'A'
         call s:TreeChomp('rm', '-f', '--', info.paths[0])
       elseif info.section ==# 'Unstaged'
         call s:TreeChomp('checkout', '--', info.paths[0])
       else
-        call s:TreeChomp('checkout', 'HEAD^{}', '--', info.paths[0])
+        call s:TreeChomp('checkout', '@', '--', info.paths[0])
+      endif
+      if len(undo)
+        call add(restore, ':Gsplit ' . s:fnameescape(info.relative[0]) . '|' . undo)
       endif
-      call add(restore, ':Gsplit ' . s:fnameescape(info.relative[0]) . '|' . undo)
     endfor
   catch /^fugitive:/
     let err .= '|echoerr ' . string(v:exception)
@@ -3614,6 +4447,15 @@ function! s:StageIgnore(lnum1, lnum2, count) abort
     call extend(paths, info.relative)
   endfor
   call map(paths, '"/" . v:val')
+  if !a:0
+    let dir = fugitive#Find('.git/info/')
+    if !isdirectory(dir)
+      try
+        call mkdir(dir)
+      catch
+      endtry
+    endif
+  endif
   exe 'Gsplit' (a:count ? '.gitignore' : '.git/info/exclude')
   let last = line('$')
   if last == 1 && empty(getline(1))
@@ -3653,7 +4495,7 @@ function! s:DoStageUnpushedHeading(heading) abort
     let remote = '.'
   endif
   let branch = matchstr(a:heading, 'to \%([^/]\+/\)\=\zs\S\+')
-  call feedkeys(':Git push ' . remote . ' ' . 'HEAD:' . 'refs/heads/' . branch)
+  call feedkeys(':Git push ' . remote . ' ' . '@:' . 'refs/heads/' . branch)
 endfunction
 
 function! s:DoToggleUnpushedHeading(heading) abort
@@ -3818,7 +4660,7 @@ function! s:CommitInteractive(line1, line2, range, bang, mods, options, patch) a
 endfunction
 
 function! s:CommitSubcommand(line1, line2, range, bang, mods, options) abort
-  let argv = copy(a:options.args)
+  let argv = copy(a:options.subcommand_args)
   let i = 0
   while get(argv, i, '--') !=# '--'
     if argv[i] =~# '^-[apzsneiovq].'
@@ -3879,17 +4721,17 @@ endfunction
 
 function! s:MergeSubcommand(line1, line2, range, bang, mods, options) abort
   let dir = a:options.dir
-  if empty(a:options.args) && (
+  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 'echohl WarningMsg|echo ":Git merge for loading conflicts is deprecated in favor of :Git mergetool"|echohl NONE|silent Git' . (a:bang ? '!' : '') . s:fnameescape(a:options.flags + ['mergetool'])
+    return 'echoerr ":Git merge for loading conflicts hase been removed in favor of :Git mergetool"'
   endif
   return {}
 endfunction
 
 function! s:RebaseSubcommand(line1, line2, range, bang, mods, options) abort
-  let args = a:options.args
+  let args = a:options.subcommand_args
   if s:HasOpt(args, '--autosquash') && !s:HasOpt(args, '-i', '--interactive')
     return {'env': {'GIT_SEQUENCE_EDITOR': 'true'}, 'insert_args': ['--interactive']}
   endif
@@ -4013,14 +4855,11 @@ function! s:ToolStream(line1, line2, range, bang, mods, options, args, state) ab
   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})
-  if fugitive#GitVersion(1, 9) || (!s:HasOpt(argv, '--name-status') && !prompt)
-    let exec += ['-c', 'diff.context=0']
-  endif
+  let exec = s:UserCommandList({'git': a:options.git, 'dir': a:options.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.command] + a:options.args)
-    return s:QuickfixStream(a:line2, 'difftool', title, exec, !a:bang, s:function('s:ToolParse'), a:state)
+    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)
   else
     let filename = ''
     let cmd = []
@@ -4050,14 +4889,14 @@ function! s:MergetoolSubcommand(line1, line2, range, bang, mods, options) abort
   let state = {'name_only': 0}
   let state.diff = [{'prefix': ':2:', 'module': ':2:'}, {'prefix': ':3:', 'module': ':3:'}, {'prefix': ':(top)'}]
   call map(state.diff, 'extend(v:val, {"filename": fugitive#Find(v:val.prefix, dir)})')
-  return s:ToolStream(a:line1, a:line2, a:range, a:bang, a:mods, a:options, ['--diff-filter=U'] + a:options.args, state)
+  return s:ToolStream(a:line1, a:line2, a:range, a:bang, a:mods, a:options, ['--diff-filter=U'] + a:options.subcommand_args, state)
 endfunction
 
 function! s:DifftoolSubcommand(line1, line2, range, bang, mods, options) abort
   let dir = a:options.dir
   exe s:DirCheck(dir)
   let i = 0
-  let argv = copy(a:options.args)
+  let argv = copy(a:options.subcommand_args)
   let commits = []
   let cached = 0
   let reverse = 1
@@ -4188,7 +5027,7 @@ function! s:GrepSubcommand(line1, line2, range, bang, mods, options) abort
   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.args
+  let args = a:options.subcommand_args
   if get(args, 0, '') =~# '^-O\|--open-files-in-pager$'
     let args = args[1:-1]
   endif
@@ -4206,8 +5045,18 @@ function! s:GrepSubcommand(line1, line2, range, bang, mods, options) abort
   let prefix = FugitiveVimPath(s:HasOpt(args, '--cached') || empty(tree) ?
         \ 'fugitive://' . dir . '//0/' :
         \ s:cpath(getcwd(), tree) ? '' : tree . '/')
-  exe '!' . escape(s:UserCommand(a:options, cmd + args), '%#!')
-        \ printf(&shellpipe . (&shellpipe =~# '%s' ? '' : ' %s'), s:shellesc(tempfile))
+  try
+    if exists('+guioptions') && &guioptions =~# '!'
+      let guioptions = &guioptions
+      set guioptions-=!
+    endif
+    exe '!' . escape(s:UserCommand(a:options, cmd + args), '%#!')
+          \ printf(&shellpipe . (&shellpipe =~# '%s' ? '' : ' %s'), s:shellesc(tempfile))
+  finally
+    if exists('guioptions')
+      let &guioptions = guioptions
+    endif
+  endtry
   let list = map(readfile(tempfile), 's:GrepParseLine(prefix, name_only, dir, v:val)')
   call s:QuickfixSet(listnr, list, 'a')
   silent exe s:DoAutocmd('QuickFixCmdPost ' . event)
@@ -4327,7 +5176,8 @@ function! fugitive#LogCommand(line1, count, range, bang, mods, args, type) abort
   let dir = s:Dir()
   exe s:DirCheck(dir)
   let listnr = a:type =~# '^l' ? 0 : -1
-  let [args, after] = s:SplitExpandChain(a:args, s:Tree(dir))
+  let [args, after] = s:SplitExpandChain('log ' . a:args, s:Tree(dir))
+  call remove(args, 0)
   let split = index(args, '--')
   if split > 0
     let paths = args[split : -1]
@@ -4378,7 +5228,7 @@ function! fugitive#LogCommand(line1, count, range, bang, mods, args, type) abort
   if len(path) && empty(filter(copy(args), 'v:val =~# "^[^-]"'))
     let owner = s:Owner(@%, dir)
     if len(owner)
-      call add(args, owner)
+      call add(args, owner . (owner =~# '^\x\{40,}' ? '' : '^{}'))
     endif
   endif
   if empty(extra_paths)
@@ -4390,20 +5240,23 @@ function! fugitive#LogCommand(line1, count, range, bang, mods, args, type) abort
     let format = "%h %P\t%H " . g:fugitive_summary_format
   endif
   let cmd = ['--no-pager']
-  if fugitive#GitVersion(1, 9)
-    call extend(cmd, ['-c', 'diff.context=0', '-c', 'diff.noprefix=false', 'log'])
-  else
-    call extend(cmd, ['log', '-U0', '-s'])
-  endif
-  call extend(cmd,
+  call extend(cmd, ['-c', 'diff.context=0', '-c', 'diff.noprefix=false', 'log'] +
         \ ['--no-color', '--no-ext-diff', '--pretty=format:fugitive ' . format] +
         \ args + extra_args + paths + extra_paths)
   let state.target = path
   let title = titlepre . (listnr < 0 ? 'Gclog ' : 'Gllog ') . s:fnameescape(args + paths)
+<<<<<<< HEAD
   if empty(paths + extra_paths) && empty(a:type) && a:count < 0 && len(s:Relative('/'))
     let after = '|echohl WarningMsg|echo ' . string('Use :0Glog or :0Gclog for old behavior of targeting current file') . '|echohl NONE' . after
   endif
   return s:QuickfixStream(listnr, 'log', title, s:UserCommandList(dir) + cmd, !a:bang, s:function('s:LogParse'), state, dir) . after
+<<<<<<< HEAD
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+  return s:QuickfixStream(listnr, 'log', title, s:UserCommandList(dir) + cmd, !a:bang, a:mods, s:function('s:LogParse'), state, dir) . after
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 endfunction
 
 " Section: :Gedit, :Gpedit, :Gsplit, :Gvsplit, :Gtabedit, :Gread
@@ -4412,13 +5265,25 @@ function! s:UsableWin(nr) abort
   return a:nr && !getwinvar(a:nr, '&previewwindow') && !getwinvar(a:nr, '&winfixwidth') &&
         \ (empty(getwinvar(a:nr, 'fugitive_status')) || getbufvar(winbufnr(a:nr), 'fugitive_type') !=# 'index') &&
         \ index(['gitrebase', 'gitcommit'], getbufvar(winbufnr(a:nr), '&filetype')) < 0 &&
-        \ index(['nofile','help','quickfix'], getbufvar(winbufnr(a:nr), '&buftype')) < 0
+        \ index(['nofile','help','quickfix', 'terminal'], getbufvar(winbufnr(a:nr), '&buftype')) < 0
 endfunction
 
-function! s:OpenParse(args, wants_cmd) abort
+function! s:ArgSplit(string) abort
+  let string = a:string
+  let args = []
+  while string =~# '\S'
+    let arg = matchstr(string, '^\s*\%(\\.\|[^[:space:]]\)\+')
+    let string = strpart(string, len(arg))
+    let arg = substitute(arg, '^\s\+', '', '')
+    call add(args, substitute(arg, '\\\@<!\\ ', ' ', 'g'))
+  endwhile
+  return args
+endfunction
+
+function! s:OpenParse(string, wants_cmd) abort
   let opts = []
   let cmds = []
-  let args = copy(a:args)
+  let args = s:ArgSplit(a:string)
   while !empty(args)
     if args[0] =~# '^++'
       call add(opts, ' ' . escape(remove(args, 0), ' |"'))
@@ -4430,6 +5295,14 @@ function! s:OpenParse(args, wants_cmd) abort
   endwhile
   if len(args)
     let file = join(args)
+    if file ==# '-'
+      let result = fugitive#Result()
+      if has_key(result, 'file')
+        let file = s:fnameescape(result.file)
+      else
+        throw 'fugitive: no previous command output'
+      endif
+    endif
   elseif empty(expand('%'))
     let file = ''
   elseif empty(s:DirCommitFile(@%)[1]) && s:Relative('./') !~# '^\./\.git\>'
@@ -4439,7 +5312,7 @@ function! s:OpenParse(args, wants_cmd) abort
   endif
   let dir = s:Dir()
   let efile = s:Expand(file)
-  let url = fugitive#Find(efile, dir)
+  let url = s:Generate(efile, dir)
 
   if a:wants_cmd && file[0] ==# '>' && efile[0] !=# '>' && get(b:, 'fugitive_type', '') isnot# 'tree' && &filetype !=# 'netrw'
     let line = line('.')
@@ -4515,6 +5388,25 @@ function! s:BlurStatus() abort
   endif
 endfunction
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+function! s:OpenExec(cmd, mods, args, ...) abort
+<<<<<<< HEAD
+  let dir = s:Dir(a:0 ? a:1 : -1)
+  let args = s:shellesc(a:args)
+  let temp = tempname()
+  let git = s:UserCommand(dir)
+  silent! execute '!' . escape(git . ' --no-pager ' . args, '!#%') .
+        \ (&shell =~# 'csh' ? ' >& ' . temp : ' > ' . temp . ' 2>&1')
+  redraw!
+  let temp = s:Resolve(temp)
+  let s:temp_files[s:cpath(temp)] = { 'dir': dir, 'filetype': 'git' }
+=======
+  let dir = a:0 ? s:Dir(a:1) : s:Dir()
+=======
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 function! s:OpenExec(cmd, mods, env, args, ...) abort
   let options = a:0 ? a:1 : {'dir': s:Dir()}
   let temp = tempname()
@@ -4541,18 +5433,40 @@ endfunction
 
 let s:bang_edits = {'split': 'Git', 'vsplit': 'vert Git', 'tabedit': 'tab Git', 'pedit': 'Git!'}
 function! fugitive#Open(cmd, bang, mods, arg, args) abort
+<<<<<<< HEAD
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+let s:bang_edits = {'split': 'Git', 'vsplit': 'vert Git', 'tabedit': 'tab Git', 'pedit': 'Git!'}
+function! fugitive#Open(cmd, bang, mods, arg, args) abort
+  exe s:VersionCheck()
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   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')
   endif
 
   let mods = s:Mods(a:mods)
   try
+<<<<<<< HEAD
     let [file, pre] = s:OpenParse(a:args, 1)
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+    let [file, pre] = s:OpenParse(a:args)
+    let file = s:Generate(file)
+=======
+    let [file, pre] = s:OpenParse(a:args, 1)
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+    let [file, pre] = s:OpenParse(a:arg, 1)
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   catch /^fugitive:/
     return 'echoerr ' . string(v:exception)
   endtry
-  if file !~# '^\a\a\+:'
-    let file = s:sub(file, '/$', '')
+  if file !~# '^\a\a\+:' && !(has('win32') && file =~# '^\a:/$')
+    let file = substitute(file, '.\zs' . (has('win32') ? '[\/]' : '/') . '$', '', '')
   endif
   if a:cmd ==# 'edit'
     call s:BlurStatus()
@@ -4576,7 +5490,7 @@ function! s:ReadPrepare(line1, count, range, mods) abort
   else
     let pre = ''
   endif
-  return [pre . 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
@@ -4589,17 +5503,54 @@ function! s:ReadExec(line1, count, range, mods, env, args, options) abort
 endfunction
 
 function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, args) abort
+  exe s:VersionCheck()
   if a:bang
+<<<<<<< HEAD
     return 'echoerr ' . string(':Gread! for temp buffer output has been replaced by :{range}Git! --paginate')
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+    try
+      let cdback = s:Cd(s:Tree())
+      let git = s:UserCommand()
+      let args = s:ShellExpand(a:arg)
+      silent execute mods . after . 'read!' escape(git . ' --no-pager ' . args, '!#%')
+    finally
+      execute cdback
+    endtry
+=======
+    let dir = s:Dir()
+    let args = s:SplitExpand(a:arg, s:Tree(dir))
+<<<<<<< HEAD
+    silent execute mods . after . 'read!' escape(s:UserCommand(dir, ['--no-pager'] + args), '!#%')
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+    execute delete . 'diffupdate'
+    call fugitive#ReloadStatus(dir, 1)
+    return 'redraw|echo '.string(':!'.s:UserCommand(dir, args))
+=======
+    return s:ReadExec(a:line1, a:count, a:range, a:mods, {}, args, {'dir': dir})
+>>>>>>> master
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   endif
   let [read, post] = s:ReadPrepare(a:line1, a:count, a:range, a:mods)
   try
     let [file, pre] = s:OpenParse(a:args, 0)
+<<<<<<< HEAD
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+    return 'echoerr ' . string(':Gread! for temp buffer output has been replaced by :{range}Git! --paginate')
+  endif
+  let [read, post] = s:ReadPrepare(a:line1, a:count, a:range, a:mods)
+  try
+    let [file, pre] = s:OpenParse(a:arg, 0)
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   catch /^fugitive:/
     return 'echoerr ' . string(v:exception)
   endtry
   if file =~# '^fugitive:' && a:count is# 0
-    return 'exe ' .string(s:Mods(a:mods) . fugitive#FileReadCmd(file, 0, pre)) . '|diffupdate'
+    return 'exe ' .string('keepalt ' . s:Mods(a:mods) . fugitive#FileReadCmd(file, 0, pre)) . '|diffupdate'
   endif
   return read . ' ' . pre . ' ' . s:fnameescape(file) . '|' . post
 endfunction
@@ -4623,17 +5574,23 @@ endfunction
 " Section: :Gwrite, :Gwq
 
 function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, args) abort
-  if s:cpath(expand('%:p'), fugitive#Find('.git/COMMIT_EDITMSG'))
+  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 ? '!' : '')
-  elseif get(b:, 'fugitive_type', '') ==# 'index'
+  elseif get(b:, 'fugitive_type', '') ==# 'index' && empty(a:arg)
     return 'Git commit'
   elseif &buftype ==# 'nowrite' && getline(4) =~# '^[+-]\{3\} '
     return 'echoerr ' . string('fugitive: :Gwrite from :Git diff has been removed in favor of :Git add --edit')
   endif
   let mytab = tabpagenr()
   let mybufnr = bufnr('')
+  let args = s:ArgSplit(a:arg)
+  let after = ''
+  if get(args, 0) =~# '^+'
+    let after = '|' . remove(args, 0)[1:-1]
+  endif
   try
-    let file = len(a:args) ? s:Generate(s:Expand(join(a:args, ' '))) : fugitive#Real(@%)
+    let file = len(args) ? s:Generate(s:Expand(join(args, ' '))) : fugitive#Real(@%)
   catch /^fugitive:/
     return 'echoerr ' . string(v:exception)
   endtry
@@ -4706,9 +5663,9 @@ function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, args) abor
     setlocal nomodified
   endif
 
-  let one = s:Generate(':1:'.file)
-  let two = s:Generate(':2:'.file)
-  let three = s:Generate(':3:'.file)
+  let one = fugitive#Find(':1:'.file)
+  let two = fugitive#Find(':2:'.file)
+  let three = fugitive#Find(':3:'.file)
   for nr in range(1,bufnr('$'))
     let name = fnamemodify(bufname(nr), ':p')
     if bufloaded(nr) && !getbufvar(nr,'&modified') && (name ==# one || name ==# two || name ==# three)
@@ -4717,7 +5674,7 @@ function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, args) abor
   endfor
 
   unlet! restorewinnr
-  let zero = s:Generate(':0:'.file)
+  let zero = fugitive#Find(':0:'.file)
   silent exe s:DoAutocmd('BufWritePost ' . s:fnameescape(zero))
   for tab in range(1,tabpagenr('$'))
     for winnr in range(1,tabpagewinnr(tab,'$'))
@@ -4748,7 +5705,7 @@ function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, args) abor
     endfor
   endfor
   call fugitive#ReloadStatus(-1, 1)
-  return 'checktime'
+  return 'silent checktime' . after
 endfunction
 
 function! fugitive#WqCommand(...) abort
@@ -4774,8 +5731,104 @@ function! fugitive#FetchComplete(A, L, P, ...) abort
   return s:CompleteSub('fetch', a:A, a:L, a:P, function('s:CompleteRemote'), a:000)
 endfunction
 
+<<<<<<< HEAD
 " Section: :Gdiff
 
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+function! s:AskPassArgs(dir) abort
+  if (len($DISPLAY) || len($TERM_PROGRAM) || has('gui_running')) && fugitive#GitVersion(1, 8) &&
+        \ empty($GIT_ASKPASS) && empty($SSH_ASKPASS) && empty(get(fugitive#Config(a:dir), 'core.askpass', []))
+    if s:executable(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']
+    endif
+  endif
+  return []
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+endfunction
+
+function! s:Dispatch(bang, cmd, args) abort
+  let dir = s:Dir()
+=======
+function! s:Dispatch(bang, options) abort
+  let dir = a:options.dir
+  exe s:DirCheck(dir)
+>>>>>>> master
+  let [mp, efm, cc] = [&l:mp, &l:efm, get(b:, 'current_compiler', '')]
+  try
+    let b:current_compiler = 'git'
+    let &l:errorformat = s:common_efm .
+          \ ',%\&git_dir=' . escape(substitute(dir, '%', '%%', 'g'), '\,')
+    let &l:makeprg = s:UserCommand({'git': a:options.git, 'dir': dir}, s:AskPassArgs(dir) + a:options.flags + [a:options.command] + a:options.args)
+    if exists(':Make') == 2
+      Make
+      return ''
+    else
+<<<<<<< HEAD
+      try
+        if !has('patch-8.1.0334') && &autowrite
+          let autowrite_was_set = 1
+          set noautowrite
+          wall
+        endif
+        silent noautocmd make!
+      finally
+        if exists('autowrite_was_set')
+          set autowrite
+        endif
+      endtry
+=======
+      if !has('patch-8.1.0334') && has('terminal') && &autowrite
+        let autowrite_was_set = 1
+        set noautowrite
+        silent! wall
+      endif
+      silent noautocmd make!
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+      redraw!
+      return 'call fugitive#Cwindow()|silent ' . s:DoAutocmd('ShellCmdPost')
+    endif
+  finally
+    let [&l:mp, &l:efm, b:current_compiler] = [mp, efm, cc]
+    if empty(cc) | unlet! b:current_compiler | endif
+    if exists('autowrite_was_set')
+      set autowrite
+    endif
+  endtry
+endfunction
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+call s:command("-nargs=? -bang -complete=customlist,s:PushComplete Gpush  execute s:Dispatch('<bang>', 'push '.<q-args>)")
+call s:command("-nargs=? -bang -complete=customlist,s:FetchComplete Gfetch execute s:Dispatch('<bang>', 'fetch '.<q-args>)")
+
+" Section: :Gdiff
+
+call s:command("-bang -bar -nargs=* -complete=customlist,fugitive#CompleteObject Gdiffsplit  :execute s:Diff(1, <bang>0, '<mods>', <f-args>)")
+call s:command("-bang -bar -nargs=* -complete=customlist,fugitive#CompleteObject Gvdiffsplit :execute s:Diff(0, <bang>0, 'vertical <mods>', <f-args>)")
+call s:command("-bang -bar -nargs=* -complete=customlist,fugitive#CompleteObject Ghdiffsplit :execute s:Diff(0, <bang>0, '<mods>', <f-args>)")
+=======
+function! s:PushSubcommand(line1, line2, range, bang, mods, args) abort
+  return s:Dispatch(a:bang ? '!' : '', 'push', a:args)
+=======
+function! s:PushSubcommand(line1, line2, range, bang, mods, options) abort
+  return s:Dispatch(a:bang ? '!' : '', a:options)
+>>>>>>> master
+endfunction
+
+function! s:FetchSubcommand(line1, line2, range, bang, mods, options) abort
+  return s:Dispatch(a:bang ? '!' : '', a:options)
+endfunction
+
+=======
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+" Section: :Gdiff
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 augroup fugitive_diff
   autocmd!
   autocmd BufWinLeave * nested
@@ -4894,7 +5947,16 @@ function! s:IsConflicted() abort
 endfunction
 
 function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
+<<<<<<< HEAD
   let args = copy(a:args)
+<<<<<<< HEAD
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+  exe s:VersionCheck()
+  let args = s:ArgSplit(a:arg)
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   let post = ''
   if get(args, 0) =~# '^+'
     let post = remove(args, 0)[1:-1]
@@ -4913,12 +5975,12 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
   let back = exists('*win_getid') ? 'call win_gotoid(' . win_getid() . ')' : 'wincmd p'
   if (empty(args) || args[0] ==# ':') && a:keepfocus
     exe s:DirCheck()
-    if empty(commit) && s:IsConflicted()
+    if commit =~# '^1\=$' && s:IsConflicted()
       let parents = [s:Relative(':2:'), s:Relative(':3:')]
     elseif empty(commit)
       let parents = [s:Relative(':0:')]
     elseif commit =~# '^\d\=$'
-      let parents = [s:Relative('HEAD:')]
+      let parents = [s:Relative('@:')]
     elseif commit =~# '^\x\x\+$'
       let parents = s:LinesError(['rev-parse', commit . '^@'])[0]
       call map(parents, 's:Relative(v:val . ":")')
@@ -4929,7 +5991,7 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
       exe pre
       let mods = (a:autodir ? s:diff_modifier(len(parents) + 1) : '') . s:Mods(mods, 'leftabove')
       let nr = bufnr('')
-      execute mods 'split' s:fnameescape(s:Generate(parents[0]))
+      execute mods 'split' s:fnameescape(fugitive#Find(parents[0]))
       call s:Map('n', 'dp', ':diffput '.nr.'<Bar>diffupdate<CR>', '<silent>')
       let nr2 = bufnr('')
       call s:diffthis()
@@ -4937,7 +5999,7 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
       call s:Map('n', 'd2o', ':diffget '.nr2.'<Bar>diffupdate<CR>', '<silent>')
       let mods = substitute(mods, '\Cleftabove\|rightbelow\|aboveleft\|belowright', '\=submatch(0) =~# "f" ? "rightbelow" : "leftabove"', '')
       for i in range(len(parents)-1, 1, -1)
-        execute mods 'split' s:fnameescape(s:Generate(parents[i]))
+        execute mods 'split' s:fnameescape(fugitive#Find(parents[i]))
         call s:Map('n', 'dp', ':diffput '.nr.'<Bar>diffupdate<CR>', '<silent>')
         let nrx = bufnr('')
         call s:diffthis()
@@ -5000,8 +6062,6 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
       set diffopt-=vertical
     endif
     execute mods 'diffsplit' s:fnameescape(spec)
-    let &l:readonly = &l:readonly
-    redraw
     let w:fugitive_diff_restore = restore
     let winnr = winnr()
     if getwinvar('#', '&diff')
@@ -5019,7 +6079,7 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
   endtry
 endfunction
 
-" Section: :Gmove, :Gremove
+" Section: :GMove, :GRemove
 
 function! s:Move(force, rename, destination) abort
   let dir = s:Dir()
@@ -5118,9 +6178,9 @@ endfunction
 function! s:Keywordprg() abort
   let args = ' --git-dir='.escape(s:Dir(),"\\\"' ")
   if has('gui_running') && !has('win32')
-    return g:fugitive_git_executable . ' --no-pager' . args . ' log -1'
+    return s:GitShellCmd() . ' --no-pager' . args . ' log -1'
   else
-    return g:fugitive_git_executable . args . ' show'
+    return s:GitShellCmd() . args . ' show'
   endif
 endfunction
 
@@ -5137,7 +6197,7 @@ endfunction
 function! s:BlameBufnr(...) abort
   let state = s:TempState(bufname(a:0 ? a:1 : ''))
   if get(state, 'filetype', '') ==# 'fugitiveblame'
-    return get(state, 'bufnr', -1)
+    return get(state, 'origin_bufnr', -1)
   else
     return -1
   endif
@@ -5145,7 +6205,10 @@ endfunction
 
 function! s:BlameCommitFileLnum(...) abort
   let line = a:0 ? a:1 : getline('.')
-  let state = a:0 ? a:2 : s:TempState()
+  let state = a:0 > 1 ? a:2 : s:TempState()
+  if get(state, 'filetype', '') !=# 'fugitiveblame'
+    return ['', '', 0]
+  endif
   let commit = matchstr(line, '^\^\=[?*]*\zs\x\+')
   if commit =~# '^0\+$'
     let commit = ''
@@ -5188,7 +6251,7 @@ endfunction
 function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
   let dir = s:Dir()
   exe s:DirCheck(dir)
-  let flags = copy(a:options.args)
+  let flags = copy(a:options.subcommand_args)
   let i = 0
   let raw = 0
   let commits = []
@@ -5261,33 +6324,40 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
   endif
   exe s:BlameLeave()
   try
-    let cmd = a:options.flags + ['--no-pager', '-c', 'blame.coloring=none', '-c', 'blame.blankBoundary=false', a:options.command, '--show-number']
+    let cmd = a:options.flags + ['--no-pager', '-c', 'blame.coloring=none', '-c', 'blame.blankBoundary=false', a:options.subcommand, '--show-number']
     call extend(cmd, filter(copy(flags), 'v:val !~# "\\v^%(-b|--%(no-)=color-.*|--progress)$"'))
     if a:count > 0 && empty(ranges)
       let cmd += ['-L', (a:line1 ? a:line1 : line('.')) . ',' . (a:line1 ? a:line1 : line('.'))]
     endif
     call extend(cmd, ranges)
+    let tempname = tempname()
+    let temp = tempname . (raw ? '' : '.fugitiveblame')
     if len(commits)
       let cmd += commits
     elseif empty(files) && len(matchstr(s:DirCommitFile(@%)[1], '^\x\x\+$'))
       let cmd += [matchstr(s:DirCommitFile(@%)[1], '^\x\x\+$')]
     elseif empty(files) && !s:HasOpt(flags, '--reverse')
+<<<<<<< HEAD
       let cmd += ['--contents', '-']
+<<<<<<< HEAD
+=======
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+      let cmd += ['--contents', tempname . '.in']
+      silent execute 'noautocmd keepalt %write ' . s:fnameescape(tempname . '.in')
+      let delete_in = 1
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
     endif
-    let basecmd = escape(s:UserCommand({'git': a:options.git, 'dir': dir}, cmd + ['--'] + (len(files) ? files : [file])), '!#%')
-    let tempname = tempname()
-    let error = tempname . '.err'
-    let temp = tempname . (raw ? '' : '.fugitiveblame')
-    if &shell =~# 'csh'
-      silent! execute '%write !('.basecmd.' > '.temp.') >& '.error
-    else
-      silent! execute '%write !'.basecmd.' > '.temp.' 2> '.error
+    let basecmd = [{'git': a:options.git, 'dir': dir}] + ['--literal-pathspecs'] + cmd + ['--'] + (len(files) ? files : [file])
+    let [err, exec_error] = s:TempCmd(temp, basecmd)
+    if exists('delete_in')
+      call delete(tempname . '.in')
     endif
-    let l:shell_error = v:shell_error
     redraw
     try
-      if l:shell_error
-        let lines = readfile(error)
+      if exec_error
+        let lines = split(err, "\n")
         if empty(lines)
           let lines = readfile(temp)
         endif
@@ -5306,7 +6376,17 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
         endfor
         return ''
       endif
-      let temp_state = {'dir': dir, 'filetype': (raw ? '' : 'fugitiveblame'), 'options': a:options, 'blame_flags': flags, 'blame_file': file}
+      let temp_state = {
+            \ 'git': a:options.git,
+            \ 'flags': a:options.flags,
+            \ 'args': [a:options.subcommand] + a:options.subcommand_args,
+            \ 'dir': dir,
+            \ 'git_dir': dir,
+            \ 'cwd': s:UserCommandCwd(dir),
+            \ 'filetype': (raw ? 'git' : 'fugitiveblame'),
+            \ 'blame_options': a:options,
+            \ 'blame_flags': flags,
+            \ 'blame_file': file}
       if s:HasOpt(flags, '--reverse')
         let temp_state.blame_reverse_end = matchstr(get(commits, 0, ''), '\.\.\zs.*')
       endif
@@ -5315,23 +6395,25 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
         return s:BlameCommit(edit, get(readfile(temp), 0, ''), temp_state)
       else
         let temp = s:Resolve(temp)
-        let s:temp_files[s:cpath(temp)] = temp_state
+        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 mods = s:Mods(a:mods)
           if a:count != 0
             exe 'silent keepalt' mods 'split' s:fnameescape(temp)
           elseif !&modified || a:bang || &bufhidden ==# 'hide' || (empty(&bufhidden) && &hidden)
             exe 'silent' mods 'edit' . (a:bang ? '! ' : ' ') . s:fnameescape(temp)
           else
-            return mods . 'edit ' . s:fnameescape(temp)
+            return mods . 'edit ' . s:fnameescape(temp) . reload
           endif
-          return ''
+          return reload[1 : -1]
         endif
         if a:mods =~# '\<tab\>'
           silent tabedit %
         endif
         let bufnr = bufnr('')
-        let temp_state.bufnr = bufnr
+        let temp_state.origin_bufnr = bufnr
         let restore = []
         let mods = substitute(a:mods, '\<tab\>', '', 'g')
         for winnr in range(winnr('$'),1,-1)
@@ -5384,12 +6466,40 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
         if exists('+signcolumn')
           setlocal signcolumn=no
         endif
+<<<<<<< HEAD
         execute "vertical resize ".(s:linechars('.\{-\}\ze\s\+\d\+)')+1)
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+        let nowait = v:version >= 704 ? '<nowait>' : ''
+        nnoremap <buffer> <silent> <F1> :help fugitive-:Gblame<CR>
+        nnoremap <buffer> <silent> g?   :help fugitive-:Gblame<CR>
+        if empty(mapcheck('q'))
+          nnoremap <buffer> <silent> q    :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete','^-1','','')<CR>
+        endif
+        exe 'nnoremap <buffer> <silent>' s:nowait "gq :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete<Bar>if expand(''%:p'') =~# ''^fugitive:[\\/][\\/]''<Bar>Gedit<Bar>endif','^-1','','')<CR>"
+        nnoremap <buffer> <silent> <CR> :<C-U>exe <SID>BlameCommit("exe 'norm gq'<Bar>edit")<CR>
+        nnoremap <buffer> <silent> -    :<C-U>exe <SID>BlameJump('')<CR>
+        nnoremap <buffer> <silent> P    :<C-U>exe <SID>BlameJump('^'.v:count1)<CR>
+        nnoremap <buffer> <silent> ~    :<C-U>exe <SID>BlameJump('~'.v:count1)<CR>
+        nnoremap <buffer> <silent> i    :<C-U>exe <SID>BlameCommit("exe 'norm q'<Bar>edit")<CR>
+        nnoremap <buffer> <silent> o    :<C-U>exe <SID>BlameCommit((&splitbelow ? "botright" : "topleft")." split")<CR>
+        nnoremap <buffer> <silent> O    :<C-U>exe <SID>BlameCommit("tabedit")<CR>
+        nnoremap <buffer> <silent> p    :<C-U>exe <SID>Open((&splitbelow ? "botright" : "topleft").' pedit', 0, '', matchstr(getline('.'), '\x\+'), [matchstr(getline('.'), '\x\+')])<CR>
+        nnoremap <buffer> <silent> A    :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze [0-9:/+-][0-9:/+ -]* \d\+)')+1+v:count)<CR>
+        nnoremap <buffer> <silent> C    :<C-u>exe "vertical resize ".(<SID>linechars('^\S\+')+1+v:count)<CR>
+        nnoremap <buffer> <silent> D    :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze\d\ze\s\+\d\+)')+1-v:count)<CR>
+=======
+=======
+        execute "vertical resize ".(s:linechars('.\{-\}\s\+\d\+\ze)')+1)
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
         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>')
         redraw
         syncbind
+        exe s:DoAutocmdChanged(temp_state)
       endif
     endtry
     return ''
@@ -5460,7 +6570,7 @@ function! s:BlameJump(suffix, ...) abort
     return 'echoerr ' . string('fugitive: could not determine filename for blame')
   endif
   if commit =~# '^0*$'
-    let commit = 'HEAD'
+    let commit = '@'
     let suffix = ''
   endif
   let offset = line('.') - line('w0')
@@ -5487,10 +6597,10 @@ function! s:BlameJump(suffix, ...) abort
   let my_bufnr = bufnr('')
   if blame_bufnr < 0
     let blame_args = flags + [commit . suffix, '--', path]
-    let result = s:BlameSubcommand(0, 0, 0, 0, '', extend({'args': blame_args}, state.options, 'keep'))
+    let result = s:BlameSubcommand(0, 0, 0, 0, '', extend({'subcommand_args': blame_args}, state.blame_options, 'keep'))
   else
     let blame_args = flags
-    let result = s:BlameSubcommand(-1, -1, 0, 0, '', extend({'args': blame_args}, state.options, 'keep'))
+    let result = s:BlameSubcommand(-1, -1, 0, 0, '', extend({'subcommand_args': blame_args}, state.blame_options, 'keep'))
   endif
   if bufnr('') == my_bufnr
     return result
@@ -5517,7 +6627,6 @@ function! fugitive#BlameSyntax() abort
   syn spell notoplevel
   syn match FugitiveblameBlank                      "^\s\+\s\@=" nextgroup=FugitiveblameAnnotation,FugitiveblameScoreDebug,FugitiveblameOriginalFile,FugitiveblameOriginalLineNumber skipwhite
   syn match FugitiveblameHash       "\%(^\^\=[?*]*\)\@<=\<\x\{7,\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameScoreDebug,FugitiveblameOriginalLineNumber,FugitiveblameOriginalFile skipwhite
-  syn match FugitiveblameUncommitted "\%(^\^\=\)\@<=\<0\{7,\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameScoreDebug,FugitiveblameOriginalLineNumber,FugitiveblameOriginalFile skipwhite
   if s:HasOpt(flags, '-b') || FugitiveConfigGet('blame.blankBoundary') =~# '^1$\|^true$'
     syn match FugitiveblameBoundaryIgnore "^\^[*?]*\x\{7,\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameScoreDebug,FugitiveblameOriginalLineNumber,FugitiveblameOriginalFile skipwhite
   else
@@ -5526,7 +6635,7 @@ function! fugitive#BlameSyntax() abort
   syn match FugitiveblameScoreDebug        " *\d\+\s\+\d\+\s\@=" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile contained skipwhite
   syn region FugitiveblameAnnotation matchgroup=FugitiveblameDelimiter start="(" end="\%(\s\d\+\)\@<=)" contained keepend oneline
   syn match FugitiveblameTime "\<[0-9:/+-][0-9:/+ -]*[0-9:/+-]\%(\s\+\d\+)\)\@=" contained containedin=FugitiveblameAnnotation
-  exec 'syn match FugitiveblameLineNumber         "\s*\d\+)\@=" contained containedin=FugitiveblameAnnotation' conceal
+  exec 'syn match FugitiveblameLineNumber         "\s[[:digit:][:space:]]\{0,' . (len(line('$'))-1). '\}\d)\@=" contained containedin=FugitiveblameAnnotation' conceal
   exec 'syn match FugitiveblameOriginalFile       "\s\%(\f\+\D\@<=\|\D\@=\f\+\)\%(\%(\s\+\d\+\)\=\s\%((\|\s*\d\+)\)\)\@=" contained nextgroup=FugitiveblameOriginalLineNumber,FugitiveblameAnnotation skipwhite' (s:HasOpt(flags, '--show-name', '-f') ? '' : conceal)
   exec 'syn match FugitiveblameOriginalLineNumber "\s*\d\+\%(\s(\)\@=" contained nextgroup=FugitiveblameAnnotation skipwhite' (s:HasOpt(flags, '--show-number', '-n') ? '' : conceal)
   exec 'syn match FugitiveblameOriginalLineNumber "\s*\d\+\%(\s\+\d\+)\)\@=" contained nextgroup=FugitiveblameShort skipwhite' (s:HasOpt(flags, '--show-number', '-n') ? '' : conceal)
@@ -5549,38 +6658,44 @@ function! fugitive#BlameSyntax() abort
   endif
   let seen = {}
   for lnum in range(1, line('$'))
-    let hash = matchstr(getline(lnum), '^\^\=\zs\x\{6\}')
-    if hash ==# '' || hash ==# '000000' || has_key(seen, hash)
+    let orig_hash = matchstr(getline(lnum), '^\^\=[*?]*\zs\x\{6\}')
+    let hash = orig_hash
+    let hash = substitute(hash, '\(\x\)\x', '\=submatch(1).printf("%x", 15-str2nr(submatch(1),16))', 'g')
+    let hash = substitute(hash, '\(\x\x\)', '\=printf("%02x", str2nr(submatch(1),16)*3/4+32)', 'g')
+    if hash ==# '' || orig_hash ==# '000000' || has_key(seen, hash)
       continue
     endif
     let seen[hash] = 1
-    if &t_Co > 16 && get(g:, 'CSApprox_loaded') && !empty(findfile('autoload/csapprox/per_component.vim', escape(&rtp, ' ')))
-          \ && empty(get(s:hash_colors, hash))
-      let [s, r, g, b; __] = map(matchlist(hash, '\(\x\x\)\(\x\x\)\(\x\x\)'), 'str2nr(v:val,16)')
-      let color = csapprox#per_component#Approximate(r, g, b)
-      if color == 16 && &background ==# 'dark'
-        let color = 8
+    if &t_Co == 256
+      let [s, r, g, b; __] = map(matchlist(orig_hash, '\(\x\)\x\(\x\)\x\(\x\)\x'), 'str2nr(v:val,16)')
+      let color = 16 + (r + 1) / 3 * 36 + (g + 1) / 3 * 6 + (b + 1) / 3
+      if color == 16
+        let color = 235
+      elseif color == 231
+        let color = 255
       endif
       let s:hash_colors[hash] = ' ctermfg='.color
     else
       let s:hash_colors[hash] = ''
     endif
-    exe 'syn match FugitiveblameHash'.hash.'       "\%(^\^\=\)\@<='.hash.'\x\{1,34\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite'
+    let pattern = substitute(orig_hash, '^\(\x\)\x\(\x\)\x\(\x\)\x$', '\1\\x\2\\x\3\\x', '') . '*\>'
+    exe 'syn match FugitiveblameHash'.hash.'       "\%(^\^\=[*?]*\)\@<='.pattern.'" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite'
   endfor
+  syn match FugitiveblameUncommitted "\%(^\^\=[?*]*\)\@<=\<0\{7,\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameScoreDebug,FugitiveblameOriginalLineNumber,FugitiveblameOriginalFile skipwhite
   call s:BlameRehighlight()
 endfunction
 
 function! s:BlameRehighlight() abort
   for [hash, cterm] in items(s:hash_colors)
     if !empty(cterm) || has('gui_running') || has('termguicolors') && &termguicolors
-      exe 'hi FugitiveblameHash'.hash.' guifg=#'.hash.get(s:hash_colors, hash, '')
+      exe 'hi FugitiveblameHash'.hash.' guifg=#' . hash . cterm
     else
       exe 'hi link FugitiveblameHash'.hash.' Identifier'
     endif
   endfor
 endfunction
 
-function! s:BlameFileType() abort
+function! fugitive#BlameFileType() abort
   setlocal nomodeline
   setlocal foldmethod=manual
   if len(s:Dir())
@@ -5597,56 +6712,110 @@ function! s:BlameFileType() abort
   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',  ':exe <SID>BlameQuit()<Bar>echohl WarningMsg<Bar>echo ":Git blame q is deprecated in favor of gq"<Bar>echohl NONE<CR>', '<silent>')
+    call s:Map('n', 'q',  ':echoerr "fugitive: q removed in favor of gq (or :q)"<CR>', '<silent>')
   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>')
   call s:Map('n', '<CR>', ':<C-U>exe <SID>BlameCommit("exe <SID>BlameLeave()<Bar>edit")<CR>', '<silent>')
   call s:Map('n', '-',    ':<C-U>exe <SID>BlameJump("")<CR>', '<silent>')
+  call s:Map('n', 's',    ':<C-U>exe <SID>BlameJump("")<CR>', '<silent>')
+  call s:Map('n', 'u',    ':<C-U>exe <SID>BlameJump("")<CR>', '<silent>')
   call s:Map('n', 'P',    ':<C-U>exe <SID>BlameJump("^".v:count1)<CR>', '<silent>')
   call s:Map('n', '~',    ':<C-U>exe <SID>BlameJump("~".v:count1)<CR>', '<silent>')
   call s:Map('n', 'i',    ':<C-U>exe <SID>BlameCommit("exe <SID>BlameLeave()<Bar>edit")<CR>', '<silent>')
   call s:Map('n', 'o',    ':<C-U>exe <SID>BlameCommit("split")<CR>', '<silent>')
   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>")
 endfunction
 
 augroup fugitive_blame
   autocmd!
-  autocmd FileType fugitiveblame call s:BlameFileType()
   autocmd ColorScheme,GUIEnter * call s:BlameRehighlight()
   autocmd BufWinLeave * execute getwinvar(+bufwinnr(+expand('<abuf>')), 'fugitive_leave')
 augroup END
 
-" Section: :Gbrowse
+" Section: :GBrowse
 
-let s:redirects = {}
+function! s:BrowserOpen(url, mods, echo_copy) abort
+  let url = substitute(a:url, '[ <>\|"]', '\="%".printf("%02X",char2nr(submatch(0)))', 'g')
+  let mods = s:Mods(a:mods)
+  if a:echo_copy
+    if has('clipboard')
+      let @+ = url
+    endif
+    return 'echo '.string(url)
+  elseif exists(':Browse') == 2
+    return 'echo '.string(url).'|' . mods . 'Browse '.url
+  elseif exists(':OpenBrowser') == 2
+    return 'echo '.string(url).'|' . mods . 'OpenBrowser '.url
+  else
+    if !exists('g:loaded_netrw')
+      runtime! autoload/netrw.vim
+    endif
+    if exists('*netrw#BrowseX')
+      return 'echo '.string(url).'|' . mods . 'call netrw#BrowseX('.string(url).', 0)'
+    elseif exists('*netrw#NetrwBrowseX')
+      return 'echo '.string(url).'|' . mods . 'call netrw#NetrwBrowseX('.string(url).', 0)'
+    else
+      return 'echoerr ' . string('Netrw not found. Define your own :Browse to use :GBrowse')
+    endif
+  endif
+endfunction
 
 function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abort
+  exe s:VersionCheck()
   let dir = s:Dir()
-  exe s:DirCheck(dir)
   try
+    let arg = a:arg
+    if arg =~# '^++remote='
+      let remote = matchstr(arg, '^++remote=\zs\S\+')
+      let arg = matchstr(arg, '\s\zs\S.*')
+    endif
     let validremote = '\.\|\.\=/.*\|[[:alnum:]_-]\+\%(://.\{-\}\)\='
-    if a:args ==# ['-']
-      if a:count >= 0
-        return 'echoerr ' . string('fugitive: ''-'' no longer required to get persistent URL if range given')
-      else
-        return 'echoerr ' . string('fugitive: use :0Gbrowse instead of :Gbrowse -')
-      endif
-    elseif len(a:args)
-      let remote = matchstr(join(a:args, ' '),'@\zs\%('.validremote.'\)$')
-      let rev = substitute(join(a:args, ' '),'@\%('.validremote.'\)$','','')
-    else
+    if arg ==# '-'
       let remote = ''
       let rev = ''
-    endif
-    if rev ==# ''
-      let rev = s:DirRev(@%)[1]
-    endif
-    if rev =~# '^:\=$'
-      let expanded = s:Relative()
+      let result = fugitive#Result()
+      if filereadable(get(result, 'file', ''))
+        for line in readfile(result.file, 4096)
+          let rev = s:fnameescape(matchstr(line, '\<https\=://[^[:space:]<>]*[^[:space:]<>.,;:"''!?]'))
+          if len(rev)
+            break
+          endif
+        endfor
+        if empty(rev)
+          return 'echoerr ' . string('fugitive: no URL found in output of last :Git')
+        endif
+      endif
+    elseif !exists('l:remote')
+      let remote = matchstr(arg, '@\zs\%('.validremote.'\)$')
+      let rev = substitute(arg, '@\%('.validremote.'\)$','','')
     else
-      let expanded = s:Expand(rev)
+      let rev = arg
+    endif
+    if rev =~? '^\a\a\+:[\/][\/]' && rev !~? '^fugitive:'
+      let rev = substitute(rev, '\\\@<![#!]\|\\\@<!%\ze\w', '\\&', 'g')
+    elseif rev ==# ':'
+      let rev = ''
+    endif
+    let expanded = s:Expand(rev)
+    if expanded =~? '^\a\a\+:[\/][\/]' && expanded !~? '^fugitive:'
+      return s:BrowserOpen(s:Slash(expanded), a:mods, a:bang)
+    endif
+    exe s:DirCheck(dir)
+    if empty(expanded)
+      let bufname = s:BufName('%')
+      let expanded = s:DirRev(bufname)[1]
+      if empty(expanded)
+        let expanded = fugitive#Path(bufname, ':(top)', dir)
+      endif
+      if a:count > 0 && bufname !=# bufname('')
+        let blame = s:BlameCommitFileLnum(getline(a:count))
+        if len(blame[0])
+          let expanded = blame[0]
+        endif
+      endif
     endif
     let cdir = FugitiveVimPath(fugitive#CommonDir(dir))
     for subdir in ['tags/', 'heads/', 'remotes/']
@@ -5654,23 +6823,22 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
         let expanded = '.git/refs/' . subdir . expanded
       endif
     endfor
-    let full = fugitive#Find(expanded, dir)
+    let full = s:Generate(expanded, dir)
     let commit = ''
     if full =~? '^fugitive:'
-      let [pathdir, commit, path] = s:DirCommitFile(full)
+      let [dir, commit, path] = s:DirCommitFile(full)
       if commit =~# '^:\=\d$'
         let commit = ''
       endif
       if commit =~ '..'
-        let type = s:TreeChomp('cat-file','-t',commit.s:sub(path,'^/',':'))
+        let type = s:TreeChomp(['cat-file','-t',commit.s:sub(path,'^/',':')], dir)
         let branch = matchstr(expanded, '^[^:]*')
+      elseif empty(path) || path ==# '/'
+        let type = 'tree'
       else
         let type = 'blob'
       endif
       let path = path[1:-1]
-    elseif full =~? '^\a\a\+:[\/][\/]'
-      let path = s:Slash(full)
-      let type = 'url'
     elseif empty(s:Tree(dir))
       let path = '.git/' . full[strlen(dir)+1:-1]
       let type = ''
@@ -5710,48 +6878,78 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
     elseif path =~# '^\.git/refs/heads/.'
       let branch = path[16:-1]
     elseif !exists('branch')
-      let branch = FugitiveHead()
+      let branch = FugitiveHead(0, dir)
     endif
     if !empty(branch)
-      let r = fugitive#Config('branch.'.branch.'.remote')
-      let m = fugitive#Config('branch.'.branch.'.merge')[11:-1]
+      let r = FugitiveConfigGet('branch.'.branch.'.remote', dir)
+      let m = FugitiveConfigGet('branch.'.branch.'.merge', dir)[11:-1]
       if r ==# '.' && !empty(m)
-        let r2 = fugitive#Config('branch.'.m.'.remote')
+        let r2 = FugitiveConfigGet('branch.'.m.'.remote', dir)
         if r2 !~# '^\.\=$'
           let r = r2
-          let m = fugitive#Config('branch.'.m.'.merge')[11:-1]
+          let m = FugitiveConfigGet('branch.'.m.'.merge', dir)[11:-1]
         endif
       endif
       if empty(remote)
         let remote = r
       endif
       if r ==# '.' || r ==# remote
-        let merge = m
-        if path =~# '^\.git/refs/heads/.'
-          let path = '.git/refs/heads/'.merge
+        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]
+          let merge = m
+          if path =~# '^\.git/refs/heads/.'
+            let path = '.git/refs/heads/'.merge
+          endif
+        else
+          let merge = branch
         endif
       endif
     endif
 
-    let line1 = a:count > 0 ? a:line1 : 0
-    let line2 = a:count > 0 ? a:count : 0
+    let line1 = a:count > 0 && type ==# 'blob' ? a:line1 : 0
+    let line2 = a:count > 0 && type ==# 'blob' ? a:count : 0
     if empty(commit) && path !~# '^\.git/'
       if a:count < 0 && !empty(merge)
         let commit = merge
       else
         let commit = ''
         if len(merge)
-          let owner = s:Owner(@%)
-          let [commit, exec_error] = s:ChompError(['merge-base', 'refs/remotes/' . remote . '/' . merge, empty(owner) ? 'HEAD' : owner, '--'])
+          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
+<<<<<<< HEAD
           if a:count > 0 && empty(a:args) && commit =~# '^\x\{40,\}$'
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+          if a:count && empty(a:args) && commit =~# '^\x\{40,\}$'
+=======
+          if a:count > 0 && empty(a:args) && commit =~# '^\x\{40,\}$'
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+          if line2 > 0 && empty(arg) && commit =~# '^\x\{40,\}$'
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
             let blame_list = tempname()
             call writefile([commit, ''], blame_list, 'b')
             let blame_in = tempname()
             silent exe '%write' blame_in
+<<<<<<< HEAD
             let [blame, exec_error] = s:LinesError(['-c', 'blame.coloring=none', 'blame', '--contents', blame_in, '-L', a:line1.','.a:count, '-S', blame_list, '-s', '--show-number', './' . path])
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+            let [blame, exec_error] = s:LinesError(['blame', '--contents', blame_in, '-L', a:line1.','.a:count, '-S', blame_list, '-s', '--show-number', './' . path])
+=======
+            let [blame, exec_error] = s:LinesError(['-c', 'blame.coloring=none', 'blame', '--contents', blame_in, '-L', a:line1.','.a:count, '-S', blame_list, '-s', '--show-number', './' . path])
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+            let [blame, exec_error] = s:LinesError(['-c', 'blame.coloring=none', 'blame', '--contents', blame_in, '-L', line1.','.line2, '-S', blame_list, '-s', '--show-number', './' . path], dir)
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
             if !exec_error
               let blame_regex = '^\^\x\+\s\+\zs\d\+\ze\s'
               if get(blame, 0) =~# blame_regex && get(blame, -1) =~# blame_regex
@@ -5782,23 +6980,13 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
     if empty(remote)
       let remote = '.'
     endif
-    let raw = fugitive#RemoteUrl(remote)
+    let raw = fugitive#RemoteUrl(remote, dir)
     if empty(raw)
       let raw = remote
     endif
 
-    if raw =~# '^https\=://' && s:executable('curl')
-      if !has_key(s:redirects, raw)
-        let s:redirects[raw] = matchstr(system('curl -I ' .
-              \ s:shellesc(raw . '/info/refs?service=git-upload-pack')),
-              \ 'Location: \zs\S\+\ze/info/refs?')
-      endif
-      if len(s:redirects[raw])
-        let raw = s:redirects[raw]
-      endif
-    endif
-
     let opts = {
+          \ 'git_dir': dir,
           \ 'dir': dir,
           \ 'repo': fugitive#repo(dir),
           \ 'remote': raw,
@@ -5809,40 +6997,19 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
           \ 'line1': line1,
           \ 'line2': line2}
 
-    if type ==# 'url'
-      let url = path
-    else
-      let url = ''
-      for Handler in get(g:, 'fugitive_browse_handlers', [])
-        let url = call(Handler, [copy(opts)])
-        if !empty(url)
-          break
-        endif
-      endfor
-    endif
+    let url = ''
+    for Handler in get(g:, 'fugitive_browse_handlers', [])
+      let url = call(Handler, [copy(opts)])
+      if !empty(url)
+        break
+      endif
+    endfor
 
     if empty(url)
-      call s:throw("No Gbrowse handler installed for '".raw."'")
+      call s:throw("No GBrowse handler installed for '".raw."'")
     endif
 
-    let url = s:gsub(url, '[ <>]', '\="%".printf("%02X",char2nr(submatch(0)))')
-    if a:bang
-      if has('clipboard')
-        let @+ = url
-      endif
-      return 'echomsg '.string(url)
-    elseif exists(':Browse') == 2
-      return 'echomsg '.string(url).'|Browse '.url
-    else
-      if !exists('g:loaded_netrw')
-        runtime! autoload/netrw.vim
-      endif
-      if exists('*netrw#BrowseX')
-        return 'echomsg '.string(url).'|call netrw#BrowseX('.string(url).', 0)'
-      else
-        return 'echomsg '.string(url).'|call netrw#NetrwBrowseX('.string(url).', 0)'
-      endif
-    endif
+    return s:BrowserOpen(url, a:mods, a:bang)
   catch /^fugitive:/
     return 'echoerr ' . string(v:exception)
   endtry
@@ -5867,14 +7034,14 @@ endfunction
 
 function! s:ContainingCommit() abort
   let commit = s:Owner(@%)
-  return empty(commit) ? 'HEAD' : commit
+  return empty(commit) ? '@' : commit
 endfunction
 
 function! s:SquashArgument(...) abort
   if &filetype == 'fugitive'
     let commit = matchstr(getline('.'), '^\%(\%(\x\x\x\)\@!\l\+\s\+\)\=\zs[0-9a-f]\{4,\}\ze \|^' . s:ref_header . ': \zs\S\+')
   elseif has_key(s:temp_files, s:cpath(expand('%:p')))
-    let commit = matchstr(getline('.'), '\<\x\{4,\}\>')
+    let commit = matchstr(getline('.'), '\S\@<!\x\{4,\}\>')
   else
     let commit = s:Owner(@%)
   endif
@@ -5894,7 +7061,7 @@ function! s:NavigateUp(count) abort
     elseif rev =~# '.:.'
       let rev = matchstr(rev, '^.[^:]*:')
     elseif rev =~# '^:'
-      let rev = 'HEAD^{}'
+      let rev = '@^{}'
     elseif rev =~# ':$'
       let rev = rev[0:-2]
     else
@@ -5922,7 +7089,7 @@ function! fugitive#MapJumps(...) abort
       call s:Map('n', 'gO',   ':<C-U>0,4' . blame_map, '<silent>')
       call s:Map('n', 'O',    ':<C-U>0,5' . blame_map, '<silent>')
 
-      call s:Map('n', 'D',  ":<C-U>call fugitive#DiffClose()<Bar>Gdiffsplit!<Bar>redraw<Bar>echohl WarningMsg<Bar> echo ':Gstatus D is deprecated in favor of dd'<Bar>echohl NONE<CR>", '<silent>')
+      call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent>')
       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>')
@@ -6018,7 +7185,7 @@ function! fugitive#MapJumps(...) abort
 
     call s:Map('n', 'co<Space>', ':Git checkout<Space>')
     call s:Map('n', 'co<CR>', ':Git checkout<CR>')
-    call s:Map('n', 'coo', ':<C-U>Git checkout <C-R>=<SID>SquashArgument()<CR> --<CR>')
+    call s:Map('n', 'coo', ':<C-U>Git checkout <C-R>=substitute(<SID>SquashArgument(),"^$",get(<SID>TempState(),"filetype","") ==# "git" ? expand("<cfile>") : "","")<CR> --<CR>')
     call s:Map('n', 'co?', ':<C-U>help fugitive_co<CR>', '<silent>')
 
     call s:Map('n', 'cb<Space>', ':Git branch<Space>')
@@ -6047,10 +7214,31 @@ function! fugitive#MapJumps(...) abort
     call s:Map('n', 'g?',    ":<C-U>help fugitive-map<CR>", '<silent>')
     call s:Map('n', '<F1>',  ":<C-U>help fugitive-map<CR>", '<silent>')
   endif
+
+  let old_browsex = maparg('<Plug>NetrwBrowseX', 'n')
+  let new_browsex = substitute(old_browsex, '\Cnetrw#CheckIfRemote(\%(netrw#GX()\)\=)', '0', 'g')
+  let new_browsex = substitute(new_browsex, 'netrw#GX()\|expand((exists("g:netrw_gx")? g:netrw_gx : ''<cfile>''))', 'fugitive#GX()', 'g')
+  if new_browsex !=# old_browsex
+    exe 'nnoremap <silent> <buffer> <Plug>NetrwBrowseX' new_browsex
+  endif
+endfunction
+
+function! fugitive#GX() abort
+  try
+    let results = &filetype ==# 'fugitive' ? s:StatusCfile() : &filetype ==# 'git' ? s:cfile() : []
+    if len(results) && len(results[0])
+      return FugitiveReal(s:Generate(results[0]))
+    endif
+  catch /^fugitive:/
+  endtry
+  return expand(get(g:, 'netrw_gx', expand('<cfile>')))
 endfunction
 
 function! s:StatusCfile(...) abort
   let tree = s:Tree()
+  if empty(tree)
+    return ['']
+  endif
   let lead = s:cpath(tree, getcwd()) ? './' : tree . '/'
   let info = s:StageInfo()
   let line = getline('.')
@@ -6074,12 +7262,15 @@ function! s:StatusCfile(...) abort
 endfunction
 
 function! fugitive#StatusCfile() abort
-  let file = s:Generate(s:StatusCfile()[0])
+  let file = fugitive#Find(s:StatusCfile()[0])
   return empty(file) ? fugitive#Cfile() : s:fnameescape(file)
 endfunction
 
 function! s:MessageCfile(...) 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.*')
@@ -6101,11 +7292,14 @@ function! s:MessageCfile(...) abort
 endfunction
 
 function! fugitive#MessageCfile() abort
-  let file = s:Generate(s:MessageCfile())
+  let file = fugitive#Find(s:MessageCfile())
   return empty(file) ? fugitive#Cfile() : s:fnameescape(file)
 endfunction
 
 function! s:cfile() abort
+  if empty(FugitiveGitDir())
+    return []
+  endif
   try
     let myhash = s:DirRev(@%)[1]
     if len(myhash)
@@ -6115,8 +7309,15 @@ function! s:cfile() abort
         let myhash = ''
       endtry
     endif
-    if empty(myhash) && getline(1) =~# '^\%(commit\|tag\) \w'
-      let myhash = matchstr(getline(1),'^\w\+ \zs\S\+')
+    if empty(myhash) && get(s:TempState(), 'filetype', '') ==# 'git'
+      let lnum = line('.')
+      while lnum > 0
+        if getline(lnum) =~# '^\%(commit\|tag\) \w'
+          let myhash = matchstr(getline(lnum),'^\w\+ \zs\S\+')
+          break
+        endif
+        let lnum -= 1
+      endwhile
     endif
 
     let showtree = (getline(1) =~# '^tree ' && getline(2) == "")
@@ -6238,9 +7439,9 @@ function! s:cfile() abort
         let prefixes.a = myhash.'^:'
         let prefixes.b = myhash.':'
       endif
-      let ref = substitute(ref, '^\(\w\)/', '\=get(prefixes, submatch(1), "HEAD:")', '')
+      let ref = substitute(ref, '^\(\w\)/', '\=get(prefixes, submatch(1), "@:")', '')
       if exists('dref')
-        let dref = substitute(dref, '^\(\w\)/', '\=get(prefixes, submatch(1), "HEAD:")', '')
+        let dref = substitute(dref, '^\(\w\)/', '\=get(prefixes, submatch(1), "@:")', '')
       endif
 
       if ref ==# '/dev/null'
@@ -6352,9 +7553,11 @@ function! fugitive#Foldtext() abort
     if exists('binary')
       return 'Binary: '.filename
     else
-      return (add<10&&remove<100?' ':'') . add . '+ ' . (remove<10&&add<100?' ':'') . remove . '- ' . filename
+      return '+-' . v:folddashes . ' ' . (add<10&&remove<100?' ':'') . add . '+ ' . (remove<10&&add<100?' ':'') . remove . '- ' . filename
     endif
-  elseif line_foldstart =~# '^# .*:$'
+  elseif line_foldstart =~# '^@@\+ .* @@'
+    return '+-' . v:folddashes . ' ' . line_foldstart
+  elseif &filetype ==# 'gitcommit' && line_foldstart =~# '^# .*:$'
     let lines = getline(v:foldstart, v:foldend)
     call filter(lines, 'v:val =~# "^#\t"')
     cal map(lines, "s:sub(v:val, '^#\t%(modified: +|renamed: +)=', '')")
diff --git a/sources_non_forked/vim-fugitive/doc/fugitive.txt b/sources_non_forked/vim-fugitive/doc/fugitive.txt
index 556b36fd..d2428438 100755
--- a/sources_non_forked/vim-fugitive/doc/fugitive.txt
+++ b/sources_non_forked/vim-fugitive/doc/fugitive.txt
@@ -59,6 +59,12 @@ that are part of Git repositories).
                         ~     reblame at [count]th first grandparent
                         P     reblame at [count]th parent (like HEAD^[count])
 
+                                                *g:fugitive_dynamic_colors*
+                        In the GUI or a 256 color terminal, commit hashes will
+                        highlighted in different colors. To disable this:
+>
+                        let g:fugitive_dynamic_colors = 0
+<
 :[range]Git blame [...] If a range is given, just that part of the file will
 :Git blame [...] {file} be blamed, and a horizontal split without
                         scrollbinding is used.  You can also give an arbitrary
@@ -78,6 +84,44 @@ that are part of Git repositories).
                                                 *:Git_mergetool*
 :Git mergetool [args]   Like |:Git_difftool|, but target merge conflicts.
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+                                                *:Git_push*
+:Git push [args]        Invoke git-push, load the results into the |quickfix|
+<<<<<<< HEAD
+:Gpush [args]           list, and invoke |:cwindow| to reveal any errors.
+>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
+=======
+                        list, and invoke |:cwindow| to reveal any errors.
+>>>>>>> master
+                        |:Dispatch| is used if available for asynchronous
+                        invocation.
+
+                                                *:Git_fetch*
+:Git fetch [args]       Like |:Git_push|, but for git-fetch.
+
+<<<<<<< HEAD
+                                                *:Git-pull* *:Gpull*
+:Gpull [args]           Deprecated alias for |:Git| pull.
+
+                                                *:Git-rebase* *:Grebase*
+:Grebase [args]         Deprecated alias for |:Git| rebase.
+
+<<<<<<< HEAD
+                                                *fugitive-:Glog*
+:Glog[!] [args]         Use git-log [args] to load the commit history into the
+                        |quickfix| list.  Jump to the first commit unless [!]
+                        is given.
+
+:{range}Glog[!] [args]  Use git-log -L to load previous revisions of the given
+=======
+                                                *:Git-commit* *:Gcommit*
+:Gcommit [args]         Deprecated alias for |:Git| commit.
+=======
+=======
+>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
                                                 *:Ggrep* *:Gcgrep* *:Git_grep*
 :Ggrep[!] [args]        |:grep|[!] with git-grep as 'grepprg'.
 :Git[!] grep [args]
@@ -206,9 +250,6 @@ that are part of Git repositories).
                                                 *:GBrowse*
 :GBrowse                Open the current file, blob, tree, commit, or tag
                         in your browser at the upstream hosting provider.
-                        If a range is given, it is appropriately appended to
-                        the URL as an anchor.
-
                         Upstream providers can be added by installing an
                         appropriate Vim plugin.  For example, GitHub can be
                         supported by installing rhubarb.vim, available at
@@ -216,16 +257,18 @@ that are part of Git repositories).
 
 :GBrowse {object}       Like :GBrowse, but for a given |fugitive-object|.
 
-:GBrowse [...]@{remote} Force using the given remote rather than the remote
-                        for the current branch.  The remote is used to
-                        determine which upstream repository to link to.
-
 :{range}GBrowse [args]  Appends an anchor to the URL that emphasizes the
                         selected lines. This also forces the URL to include a
                         commit rather than a branch name so it remains valid
                         if the file changes.  You can give a range of "0" to
                         force this behavior without including an anchor.
 
+:GBrowse [...]@{remote} Force using the given remote rather than the remote
+                        for the current branch.  The remote is used to
+                        determine which upstream repository to link to.
+
+:GBrowse {url}          Open an arbitrary URL in your browser.
+
 :[range]GBrowse! [args] Like :GBrowse, but put the URL on the clipboard rather
                         than opening it.
 
@@ -255,10 +298,16 @@ U                       Unstage everything.
 X                       Discard the change under the cursor.  This uses
                         `checkout` or `clean` under the hood.  A command is
                         echoed that shows how to undo the change.  Consult
+<<<<<<< HEAD
                         `:messages` to see it again.  You can use this during
                         a merge conflict to discard "our" changes (--theirs)
                         in the "Unstaged" section or discard "their" changes
                         (--ours) in the "Staged" section.
+=======
+                        `:messages` to see it again.  During a merge conflict,
+                        use 2X to call `checkout --ours` or 3X to call
+                        `checkout --theirs` .
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 
                                                 *fugitive_=*
 =                       Toggle an inline diff of the file under the cursor.
@@ -305,7 +354,7 @@ Navigation maps ~
 
                                                 *fugitive_<CR>*
 <CR>                    Open the file or |fugitive-object| under the cursor.
-                        in a blob, this and similar maps jump to the patch
+                        In a blob, this and similar maps jump to the patch
                         from the diff where this was added, or where it was
                         removed if a count was given.  If the line is still in
                         the work tree version, passing a count takes you to
@@ -584,7 +633,9 @@ Makefile        The file named Makefile in the work tree
 !:Makefile      The file named Makefile in the commit owning the current file
 !3^2            The second parent of the commit owning buffer #3
 .git/config     The repo config file
-:               The |fugitive-summary| buffer.
+:               The |fugitive-summary| buffer
+-               A temp file containing the last |:Git| invocation's output
+<cfile>         The file or commit under the cursor
 
 STATUSLINE                                      *fugitive-statusline*
 
diff --git a/sources_non_forked/vim-fugitive/ftplugin/fugitiveblame.vim b/sources_non_forked/vim-fugitive/ftplugin/fugitiveblame.vim
new file mode 100644
index 00000000..1037b093
--- /dev/null
+++ b/sources_non_forked/vim-fugitive/ftplugin/fugitiveblame.vim
@@ -0,0 +1,6 @@
+if exists("b:did_ftplugin") || !exists("*FugitiveGitDir")
+  finish
+endif
+let b:did_ftplugin = 1
+
+call fugitive#BlameFileType()
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 4fc59067..6c456cf9 100755
--- 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.2
+" Version:      3.3
 " GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
 
 if exists('g:loaded_fugitive')
@@ -8,20 +8,33 @@ if exists('g:loaded_fugitive')
 endif
 let g:loaded_fugitive = 1
 
+let s:bad_git_dir = '/$\|^fugitive:'
+
 function! FugitiveGitDir(...) abort
-  if !a:0 || type(a:1) == type(0) && a:1 < 0
+  if v:version < 704
+    return ''
+  elseif !a:0 || type(a:1) == type(0) && a:1 < 0
     if exists('g:fugitive_event')
       return g:fugitive_event
     endif
     let dir = get(b:, 'git_dir', '')
     if empty(dir) && (empty(bufname('')) || &buftype =~# '^\%(nofile\|acwrite\|quickfix\|prompt\)$')
       return FugitiveExtractGitDir(getcwd())
+    elseif (!exists('b:git_dir') || b:git_dir =~# s:bad_git_dir) && empty(&buftype)
+      let b:git_dir = FugitiveExtractGitDir(expand('%:p'))
+      return b:git_dir
     endif
-    return dir
+    return dir =~# s:bad_git_dir ? '' : dir
   elseif type(a:1) == type(0)
-    return getbufvar(a:1, 'git_dir')
+    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
+    let dir = getbufvar(a:1, 'git_dir')
+    return dir =~# s:bad_git_dir ? '' : dir
   elseif type(a:1) == type('')
     return substitute(s:Slash(a:1), '/$', '', '')
+  elseif type(a:1) == type({})
+    return get(a:1, 'git_dir', '')
   else
     return ''
   endif
@@ -81,6 +94,22 @@ function! FugitiveParse(...) abort
   throw v:errmsg
 endfunction
 
+" FugitiveResult() returns an object encapsulating the result of the most
+" recend :Git command.  Will be empty if no result is available.  Pass in the
+" name of a temp buffer to get the result object for that command instead.
+" Contains the following keys:
+"
+" * "args": List of command arguments, starting with the subcommand.  Will be
+"   empty for usages like :Git --help.
+" * "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,
+"   so verify with filereadable() before trying to access it.
+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
@@ -93,26 +122,32 @@ function! FugitivePrepare(...) abort
   return call('fugitive#Prepare', a:000)
 endfunction
 
+" FugitiveConfig() get returns an opaque structure that can be passed to other
+" FugitiveConfig functions in lieu of a Git directory.  This can be faster
+" when performing multiple config queries.  Do not rely on the internal
+" structure of the return value as it is not guaranteed.  If you want a full
+" dictionary of every config value, use FugitiveConfigGetRegexp('.*').
 function! FugitiveConfig(...) abort
-  if a:0 == 2 && type(a:2) != type({})
-    return fugitive#Config(a:1, FugitiveGitDir(a:2))
-  elseif a:0 == 1 && a:1 !~# '^[[:alnum:]-]\+\.'
+  if a:0 >= 2 && (type(a:2) != type({}) || has_key(a:2, 'git_dir'))
+    return call('fugitive#Config', [a:1, FugitiveGitDir(a:2)] + a:000[2:-1])
+  elseif a:0 == 1 && (type(a:1) !=# type('') || a:1 !~# '^[[:alnum:]-]\+\.')
     return fugitive#Config(FugitiveGitDir(a:1))
   else
     return call('fugitive#Config', a:000)
   endif
 endfunction
 
-" Retrieve a Git configuration value.  An optional second argument provides
-" the Git dir as with FugitiveFind().  Pass a blank string to limit to the
-" global config.
+" FugitiveConfigGet() retrieves a Git configuration value.  An optional second
+" argument provides the Git dir as with FugitiveFind().  Pass a blank string
+" to limit to the global config.
 function! FugitiveConfigGet(name, ...) abort
   return call('FugitiveConfig', [a:name] + a:000)
 endfunction
 
-" Like FugitiveConfigGet(), but return a list of all values.
+" FugitiveConfigGetAll() is like FugitiveConfigGet() but returns a list of
+" all values.
 function! FugitiveConfigGetAll(name, ...) abort
-  if a:0 && type(a:1) ==# type({})
+  if a:0 && type(a:1) ==# type({}) && !has_key(a:1, 'git_dir')
     let config = a:1
   else
     let config = fugitive#Config(FugitiveGitDir(a:0 ? a:1 : -1))
@@ -121,8 +156,32 @@ function! FugitiveConfigGetAll(name, ...) abort
   return copy(get(config, name, []))
 endfunction
 
+" FugitiveConfigGetRegexp() retrieves a dictionary of all configuration values
+" with a key matching the given pattern.  Like git config --get-regexp, but
+" using a Vim regexp.  Second argument has same semantics as
+" FugitiveConfigGet().
+function! FugitiveConfigGetRegexp(pattern, ...) abort
+  if a:0 && type(a:1) ==# type({}) && !has_key(a:2, 'git_dir')
+    let config = a:1
+  else
+    let config = fugitive#Config(FugitiveGitDir(a:0 ? a:1 : -1))
+  endif
+  let filtered = map(filter(copy(config), 'v:key =~# "\\." && v:key =~# a:pattern'), 'copy(v:val)')
+  if a:pattern !~# '\\\@<!\%(\\\\\)*\\z[se]'
+    return filtered
+  endif
+  let transformed = {}
+  for [k, v] in items(filtered)
+    let k = matchstr(k, a:pattern)
+    if len(k)
+      let transformed[k] = v
+    endif
+  endfor
+  return transformed
+endfunction
+
 function! FugitiveRemoteUrl(...) abort
-  return fugitive#RemoteUrl(a:0 ? a:1 : '', FugitiveGitDir(a:0 > 1 ? a:2 : -1))
+  return fugitive#RemoteUrl(a:0 ? a:1 : '', FugitiveGitDir(a:0 > 1 ? a:2 : -1), a:0 > 2 ? a:3 : 0)
 endfunction
 
 function! FugitiveHead(...) abort
@@ -134,7 +193,7 @@ function! FugitiveHead(...) abort
 endfunction
 
 function! FugitiveStatusline(...) abort
-  if !exists('b:git_dir')
+  if empty(get(b:, 'git_dir', ''))
     return ''
   endif
   return fugitive#Statusline()
@@ -270,16 +329,16 @@ function! FugitiveExtractGitDir(path) abort
 endfunction
 
 function! FugitiveDetect(path) abort
-  if exists('b:git_dir') && b:git_dir =~# '^$\|/$\|^fugitive:'
+  if v:version < 704
+    return ''
+  endif
+  if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir
     unlet b:git_dir
   endif
   if !exists('b:git_dir')
-    let dir = FugitiveExtractGitDir(a:path)
-    if dir !=# ''
-      let b:git_dir = dir
-    endif
+    let b:git_dir = FugitiveExtractGitDir(a:path)
   endif
-  if !exists('b:git_dir') || !exists('#User#Fugitive')
+  if empty(b:git_dir) || !exists('#User#Fugitive')
     return ''
   endif
   if v:version >= 704 || (v:version == 703 && has('patch442'))
@@ -310,13 +369,15 @@ function! FugitiveGitPath(path) abort
   return s:Slash(a:path)
 endfunction
 
-function! s:Slash(path) abort
-  if exists('+shellslash')
+if exists('+shellslash')
+  function! s:Slash(path) abort
     return tr(a:path, '\', '/')
-  else
+  endfunction
+else
+  function! s:Slash(path) abort
     return a:path
-  endif
-endfunction
+  endfunction
+endif
 
 function! s:ProjectionistDetect() abort
   let file = s:Slash(get(g:, 'projectionist_file', ''))
@@ -336,9 +397,102 @@ function! s:ProjectionistDetect() abort
   endif
 endfunction
 
-if v:version + has('patch061') < 703
-  runtime! autoload/fugitive.vim
+let s:addr_other = has('patch-8.1.560') ? '-addr=other' : ''
+let s:addr_tabs  = has('patch-7.4.542') ? '-addr=tabs' : ''
+let s:addr_wins  = has('patch-7.4.542') ? '-addr=windows' : ''
+
+if exists(':G') != 2
+  command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete G   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)
 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)
+  exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+        \ '|echohl WarningMSG|echo ":Gstatus is deprecated in favor of :Git (with no arguments)"|echohl NONE'
+endif
+
+for s:cmd in ['Commit', 'Revert', 'Merge', 'Rebase', 'Pull', 'Push', 'Fetch', 'Blame']
+<<<<<<< HEAD
+  if exists(':G' . tolower(s:cmd)) != 2
+    exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
+          \ 'echohl WarningMSG|echo ":G' . tolower(s:cmd) . ' is deprecated in favor of :Git ' . tolower(s:cmd) . '\n"|echohl NONE|'
+=======
+  if exists(':G' . tolower(s:cmd)) != 2 && get(g:, 'fugitive_legacy_commands', 1)
+    exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
+          \ 'echohl WarningMSG|echo ":G' . tolower(s:cmd) . ' is deprecated in favor of :Git ' . tolower(s:cmd) . '"|echohl NONE|'
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
+          \ 'exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "' . tolower(s:cmd) . ' " . <q-args>)'
+  endif
+endfor
+unlet s:cmd
+
+exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Gcd  exe fugitive#Cd(<q-args>, 0)"
+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)
+  exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog  :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "")'
+        \ '|echohl WarningMSG|echo ":Glog is deprecated in favor of :Gclog"|echohl NONE'
+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>])'
+
+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>])'
+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=* -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, "vert <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>, [<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=0 -complete=customlist,fugitive#CompleteObject GRemove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject 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>])'
+if exists(':Gremove') != 2 && get(g:, 'fugitive_legacy_commands', 1)
+  exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+        \ '|echohl WarningMSG|echo ":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 -complete=customlist,fugitive#CompleteObject Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+        \ '|echohl WarningMSG|echo ":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>])'
+        \ '|echohl WarningMSG|echo ":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>])'
+        \ '|echohl WarningMSG|echo ":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>])'
+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>])'
+        \ '|if <bang>1|redraw!|endif|echohl WarningMSG|echo ":Gbrowse is deprecated in favor of :GBrowse"|echohl NONE'
+endif
+
+if v:version < 704
+  finish
+endif
+
 let g:io_fugitive = {
       \ 'simplify': function('fugitive#simplify'),
       \ 'resolve': function('fugitive#resolve'),
@@ -363,27 +517,20 @@ augroup fugitive
   autocmd FileType           netrw call FugitiveDetect(fnamemodify(get(b:, 'netrw_curdir', expand('<amatch>')), ':p'))
 
   autocmd FileType git
-        \ if len(FugitiveGitDir()) |
-        \   call fugitive#MapJumps() |
-        \   call fugitive#MapCfile() |
-        \ endif
+        \ call fugitive#MapCfile()
   autocmd FileType gitcommit
-        \ if len(FugitiveGitDir()) |
-        \   call fugitive#MapCfile('fugitive#MessageCfile()') |
-        \ endif
+        \ call fugitive#MapCfile('fugitive#MessageCfile()')
   autocmd FileType git,gitcommit
-        \ if len(FugitiveGitDir()) && &foldtext ==# 'foldtext()' |
+        \ if &foldtext ==# 'foldtext()' |
         \    setlocal foldtext=fugitive#Foldtext() |
         \ endif
   autocmd FileType fugitive
-        \ if len(FugitiveGitDir()) |
-        \   call fugitive#MapCfile('fugitive#StatusCfile()') |
-        \ endif
+        \ call fugitive#MapCfile('fugitive#StatusCfile()')
   autocmd FileType gitrebase
         \ let &l:include = '^\%(pick\|squash\|edit\|reword\|fixup\|drop\|[pserfd]\)\>' |
-        \ if len(FugitiveGitDir()) |
-        \   let &l:includeexpr = 'v:fname =~# ''^\x\{4,\}$'' ? FugitiveFind(v:fname) : ' .
-        \   (len(&l:includeexpr) ? &l:includeexpr : 'v:fname') |
+        \ if &l:includeexpr !~# 'Fugitive' |
+        \   let &l:includeexpr = 'v:fname =~# ''^\x\{4,\}$'' && len(FugitiveGitDir()) ? FugitiveFind(v:fname) : ' .
+        \     (len(&l:includeexpr) ? &l:includeexpr : 'v:fname') |
         \ endif |
         \ let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') . '|setl inex= inc='
 
@@ -416,83 +563,6 @@ augroup fugitive
   autocmd User ProjectionistDetect call s:ProjectionistDetect()
 augroup END
 
-let s:addr_other = has('patch-8.1.560') ? '-addr=other' : ''
-let s:addr_tabs  = has('patch-7.4.542') ? '-addr=tabs' : ''
-let s:addr_wins  = has('patch-7.4.542') ? '-addr=windows' : ''
-
-if exists(':G') != 2
-  command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete G   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)
-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
-  exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
-endif
-
-for s:cmd in ['Commit', 'Revert', 'Merge', 'Rebase', 'Pull', 'Push', 'Fetch', 'Blame']
-  if exists(':G' . tolower(s:cmd)) != 2
-    exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
-          \ 'echohl WarningMSG|echo ":G' . tolower(s:cmd) . ' is deprecated in favor of :Git ' . tolower(s:cmd) . '\n"|echohl NONE|'
-          \ 'exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "' . tolower(s:cmd) . ' " . <q-args>)'
-  endif
-endfor
-unlet s:cmd
-
-exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Gcd  exe fugitive#Cd(<q-args>, 0)"
-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>)'
-
-exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog  :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "")'
-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>])'
-
-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>])'
-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=* -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, "vert <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>, [<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=0 -complete=customlist,fugitive#CompleteObject GRemove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject 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>])'
-if exists(':Gremove') != 2
-  exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-endif
-if exists(':Gdelete') != 2
-  exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-endif
-if exists(':Gmove') != 2
-  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject Gmove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-endif
-if exists(':Grename') != 2
-  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete Grename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-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>])'
-if exists(':Gbrowse') != 2
-  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>])'
-endif
-
 if get(g:, 'fugitive_no_maps')
   finish
 endif
diff --git a/sources_non_forked/vim-fugitive/syntax/fugitive.vim b/sources_non_forked/vim-fugitive/syntax/fugitive.vim
index e84eba4e..aab99c45 100755
--- a/sources_non_forked/vim-fugitive/syntax/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/syntax/fugitive.vim
@@ -26,7 +26,7 @@ syn match fugitiveSymbolicRef /\.\@!\%(\.\.\@!\|[^[:space:][:cntrl:]\:.]\)\+\.\@
 syn match fugitiveHash /^\x\{4,\}\S\@!/ contained containedin=@fugitiveSection
 syn match fugitiveHash /\S\@<!\x\{4,\}\S\@!/ contained
 
-syn region fugitiveHunk start=/^\%(@@\+ -\)\@=/ end=/^\%([A-Za-z?@]\|$\)\@=/ contains=@fugitiveDiff containedin=@fugitiveSection fold
+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=/^$/'
diff --git a/sources_non_forked/vim-fugitive/syntax/fugitiveblame.vim b/sources_non_forked/vim-fugitive/syntax/fugitiveblame.vim
index c06d19e0..70c1e745 100755
--- a/sources_non_forked/vim-fugitive/syntax/fugitiveblame.vim
+++ b/sources_non_forked/vim-fugitive/syntax/fugitiveblame.vim
@@ -1,4 +1,4 @@
-if exists("b:current_syntax")
+if exists("b:current_syntax") || !exists("*FugitiveGitDir")
   finish
 endif
 
diff --git a/sources_non_forked/vim-gitgutter/README.mkd b/sources_non_forked/vim-gitgutter/README.mkd
index 2a1c9fb9..5bf9285e 100755
--- a/sources_non_forked/vim-gitgutter/README.mkd
+++ b/sources_non_forked/vim-gitgutter/README.mkd
@@ -77,13 +77,16 @@ nvim -u NONE -c "helptags vim-gitgutter/doc" -c q
 
 ### Windows
 
-I recommend configuring vim-gitgutter with the full path to your git executable.  For example:
+There is a potential risk on Windows due to `cmd.exe` prioritising the current folder over folders in `PATH`.  If you have a file named `git.*` (i.e. with any extension in `PATHEXT`) in your current folder, it will be executed instead of git whenever the plugin calls git.
+
+You can avoid this risk by configuring the full path to your git executable.  For example:
 
 ```viml
+" This path probably won't work
 let g:gitgutter_git_executable = 'C:\Program Files\Git\bin\git.exe'
 ```
 
-This is to avoid a problem which occurs if you have file named `git.*` (i.e. with any extension in `PATHEXT`) in your current folder.  `cmd.exe` prioritises the current folder over folders in `PATH` and will try to execute your file instead of the `git` binary.
+Unfortunately I don't know the correct escaping for the path - if you do, please let me know!
 
 
 ### Getting started
@@ -685,8 +688,6 @@ If this plugin has helped you, or you'd like to learn more about Vim, why not ch
 
 This was one of PeepCode's all-time top three bestsellers and is now available at Pluralsight.
 
-You can read reviews on my [website][airblade].
-
 
 ### Intellectual Property
 
diff --git a/sources_non_forked/vim-gitgutter/autoload/gitgutter/diff.vim b/sources_non_forked/vim-gitgutter/autoload/gitgutter/diff.vim
index d88f8f0d..0ed77ed8 100755
--- a/sources_non_forked/vim-gitgutter/autoload/gitgutter/diff.vim
+++ b/sources_non_forked/vim-gitgutter/autoload/gitgutter/diff.vim
@@ -70,7 +70,7 @@ let s:counter = 0
 "                      grep is available.
 function! gitgutter#diff#run_diff(bufnr, from, preserve_full_diff) abort
   if gitgutter#utility#repo_path(a:bufnr, 0) == -1
-    throw 'gitgutter author fail'
+    throw 'gitgutter path not set'
   endif
 
   if gitgutter#utility#repo_path(a:bufnr, 0) == -2
diff --git a/sources_non_forked/vim-gitgutter/autoload/gitgutter/hunk.vim b/sources_non_forked/vim-gitgutter/autoload/gitgutter/hunk.vim
index dedbece5..d5b0367c 100755
--- a/sources_non_forked/vim-gitgutter/autoload/gitgutter/hunk.vim
+++ b/sources_non_forked/vim-gitgutter/autoload/gitgutter/hunk.vim
@@ -64,6 +64,9 @@ function! gitgutter#hunk#next_hunk(count) abort
         if g:gitgutter_show_msg_on_hunk_jumping
           redraw | echo printf('Hunk %d of %d', index(hunks, hunk) + 1, len(hunks))
         endif
+        if gitgutter#hunk#is_preview_window_open()
+          call gitgutter#hunk#preview()
+        endif
         return
       endif
     endif
@@ -92,6 +95,9 @@ function! gitgutter#hunk#prev_hunk(count) abort
         if g:gitgutter_show_msg_on_hunk_jumping
           redraw | echo printf('Hunk %d of %d', index(hunks, hunk) + 1, len(hunks))
         endif
+        if gitgutter#hunk#is_preview_window_open()
+          call gitgutter#hunk#preview()
+        endif
         return
       endif
     endif
@@ -243,7 +249,7 @@ function! s:hunk_op(op, ...)
       let hunk_diff = join(hunk_header + hunk_body, "\n")."\n"
 
       call s:goto_original_window()
-      call s:close_hunk_preview_window()
+      call gitgutter#hunk#close_hunk_preview_window()
       call s:stage(hunk_diff)
     endif
 
@@ -260,7 +266,7 @@ function! s:hunk_op(op, ...)
     call gitgutter#diff#process_hunks(bufnr, gitgutter#hunk#hunks(bufnr))  " so the hunk summary is updated
 
     if empty(s:current_hunk())
-      call gitgutter#utility#warn('cursor is not in a hunk')
+      call gitgutter#utility#warn('Cursor is not in a hunk')
     elseif s:cursor_in_two_hunks()
       let choice = input('Choose hunk: upper or lower (u/l)? ')
       " Clear input
@@ -270,7 +276,7 @@ function! s:hunk_op(op, ...)
       elseif choice =~ 'l'
         call a:op(gitgutter#diff#hunk_diff(bufnr, diff, 1))
       else
-        call gitgutter#utility#warn('did not recognise your choice')
+        call gitgutter#utility#warn('Did not recognise your choice')
       endif
     else
       let hunk_diff = gitgutter#diff#hunk_diff(bufnr, diff)
@@ -294,7 +300,7 @@ function! s:stage(hunk_diff)
         \ gitgutter#utility#cd_cmd(bufnr, g:gitgutter_git_executable.' '.g:gitgutter_git_args.' apply --cached --unidiff-zero - '),
         \ diff)
   if v:shell_error
-    call gitgutter#utility#warn('patch does not apply')
+    call gitgutter#utility#warn('Patch does not apply')
   else
     if exists('#User#GitGutterStage')
       execute 'doautocmd' s:nomodeline 'User GitGutterStage'
@@ -421,7 +427,7 @@ endfunction
 function! s:open_hunk_preview_window()
   if g:gitgutter_preview_win_floating
     if exists('*nvim_open_win')
-      call s:close_hunk_preview_window()
+      call gitgutter#hunk#close_hunk_preview_window()
 
       let buf = nvim_create_buf(v:false, v:false)
       " Set default width and height for now.
@@ -440,9 +446,21 @@ function! s:open_hunk_preview_window()
       call nvim_buf_set_name(buf, 'gitgutter://hunk-preview')
 
       " Assumes cursor is in original window.
+<<<<<<< HEAD
       autocmd CursorMoved <buffer> ++once call s:close_hunk_preview_window()
       if g:gitgutter_close_preview_on_escape
         nnoremap <buffer> <silent> <Esc> :call <SID>close_hunk_preview_window()<CR>
+=======
+      autocmd CursorMoved <buffer> ++once call gitgutter#hunk#close_hunk_preview_window()
+
+      if g:gitgutter_close_preview_on_escape
+        " Map <Esc> to close the floating preview.
+        nnoremap <buffer> <silent> <Esc> :<C-U>call gitgutter#hunk#close_hunk_preview_window()<CR>
+        " Ensure that when the preview window is closed, the map is removed.
+        autocmd User GitGutterPreviewClosed silent! nunmap <buffer> <Esc>
+        autocmd CursorMoved <buffer> ++once silent! nunmap <buffer> <Esc>
+        execute "autocmd WinClosed <buffer=".winbufnr(s:winid)."> doautocmd" s:nomodeline "User GitGutterPreviewClosed"
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
       endif
 
       return
@@ -466,7 +484,11 @@ function! s:open_hunk_preview_window()
     endif
   endif
 
+  " Specifying where to open the preview window can lead to the cursor going
+  " to an unexpected window when the preview window is closed (#769).
+  silent! noautocmd execute g:gitgutter_preview_win_location 'pedit gitgutter://hunk-preview'
   silent! wincmd P
+<<<<<<< HEAD
   if &previewwindow
     file gitgutter://hunk-preview
   else
@@ -475,6 +497,10 @@ function! s:open_hunk_preview_window()
     doautocmd WinEnter
     set previewwindow
   endif
+=======
+  setlocal statusline=%{''}
+  doautocmd WinEnter
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
   if exists('*win_getid')
     let s:winid = win_getid()
   else
@@ -484,7 +510,8 @@ function! s:open_hunk_preview_window()
   " Reset some defaults in case someone else has changed them.
   setlocal noreadonly modifiable noswapfile
   if g:gitgutter_close_preview_on_escape
-    nnoremap <buffer> <silent> <Esc> :pclose<CR>
+    " Ensure cursor goes to the expected window.
+    nnoremap <buffer> <silent> <Esc> :<C-U>wincmd p<Bar>pclose<CR>
   endif
 endfunction
 
@@ -498,6 +525,15 @@ function! s:close_popup_on_escape(winid, key)
 endfunction
 
 
+function! s:close_popup_on_escape(winid, key)
+  if a:key == "\<Esc>"
+    call popup_close(a:winid)
+    return 1
+  endif
+  return 0
+endfunction
+
+
 " Floating window: does not care where cursor is.
 " Preview window: assumes cursor is in preview window.
 function! s:populate_hunk_preview_window(header, body)
@@ -549,7 +585,8 @@ function! s:populate_hunk_preview_window(header, body)
     setlocal nomodified
 
     normal! G$
-    let height = min([winline(), &previewheight])
+    let hunk_height = max([body_length, winline()])
+    let height = min([hunk_height, &previewheight])
     execute 'resize' height
     1
 
@@ -579,7 +616,7 @@ function! s:goto_original_window()
 endfunction
 
 
-function! s:close_hunk_preview_window()
+function! gitgutter#hunk#close_hunk_preview_window()
   let bufnr = s:winid != 0 ? winbufnr(s:winid) : s:preview_bufnr
   call setbufvar(bufnr, '&modified', 0)
 
@@ -594,3 +631,19 @@ function! s:close_hunk_preview_window()
   let s:winid = 0
   let s:preview_bufnr = 0
 endfunction
+
+
+function gitgutter#hunk#is_preview_window_open()
+  if g:gitgutter_preview_win_floating
+    if win_id2win(s:winid) > 0
+      execute win_id2win(s:winid).'wincmd c'
+    endif
+  else
+    for i in range(1, winnr('$'))
+      if getwinvar(i, '&previewwindow')
+        return 1
+      endif
+    endfor
+  endif
+  return 0
+endfunction
diff --git a/sources_non_forked/vim-gitgutter/autoload/gitgutter/utility.vim b/sources_non_forked/vim-gitgutter/autoload/gitgutter/utility.vim
index 70e44ace..5486c3b8 100755
--- a/sources_non_forked/vim-gitgutter/autoload/gitgutter/utility.vim
+++ b/sources_non_forked/vim-gitgutter/autoload/gitgutter/utility.vim
@@ -30,7 +30,7 @@ endfunction
 
 function! gitgutter#utility#warn(message) abort
   echohl WarningMsg
-  echo 'vim-gitgutter: ' . a:message
+  echo a:message
   echohl None
   let v:warningmsg = a:message
 endfunction
@@ -39,7 +39,7 @@ function! gitgutter#utility#warn_once(bufnr, message, key) abort
   if empty(gitgutter#utility#getbufvar(a:bufnr, a:key))
     call gitgutter#utility#setbufvar(a:bufnr, a:key, '1')
     echohl WarningMsg
-    redraw | echom 'vim-gitgutter: ' . a:message
+    redraw | echom a:message
     echohl None
     let v:warningmsg = a:message
   endif
diff --git a/sources_non_forked/vim-gitgutter/doc/gitgutter.txt b/sources_non_forked/vim-gitgutter/doc/gitgutter.txt
index e5bb0584..b6498e43 100755
--- a/sources_non_forked/vim-gitgutter/doc/gitgutter.txt
+++ b/sources_non_forked/vim-gitgutter/doc/gitgutter.txt
@@ -63,15 +63,20 @@ Neovim:~
 ===============================================================================
 WINDOWS                                                     *gitgutter-windows*
 
-I recommend configuring vim-gitgutter with the full path to your git executable.
+There is a potential risk on Windows due to `cmd.exe` prioritising the current
+folder over folders in `PATH`.  If you have a file named `git.*` (i.e. with
+any extension in `PATHEXT`) in your current folder, it will be executed
+instead of git whenever the plugin calls git.
+
+You can avoid this risk by configuring the full path to your git executable.
 For example:
 >
+    " This path probably won't work
     let g:gitgutter_git_executable = 'C:\Program Files\Git\bin\git.exe'
 <
-This is to avoid a problem which occurs if you have file named "git.*" (i.e.
-with any extension in "PATHEXT") in your current folder.  "cmd.exe" prioritises
-the current folder over folders in 'PATH' and will try to execute your file
-instead of the "git" binary.
+
+Unfortunately I don't know the correct escaping for the path - if you do,
+please let me know!
 
 
 ===============================================================================
@@ -172,14 +177,36 @@ Commands for operating on a hunk:~
 
                                               *gitgutter-:GitGutterPreviewHunk*
 :GitGutterPreviewHunk   Preview the hunk the cursor is in.
+<<<<<<< HEAD
                         Use |:pclose| or |CTRL-W_CTRL-Z| to close the preview
                         window, or set |g:gitgutter_close_preview_on_escape|
                         and use <Esc>.
+=======
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 
                         To stage part of the hunk, move to the preview window,
                         delete any lines you do not want to stage, and
                         |GitGutterStageHunk|.
 
+                        To close a non-floating preview window use |:pclose|
+                        or |CTRL-W_z| or |CTRL-W_CTRL-Z|; or normal window-
+                        closing (|:quit| or |:close| or |CTRL-W_c|) if your cursor
+                        is in the preview window.
+
+                        To close a floating window when the cursor is in the
+                        original buffer, move the cursor.
+
+                        To close a floating window when the cursor is in the
+                        floating window use normal window-closing, or move to
+                        the original window with |CTRL-W_p|.  Alternatively set
+                        |g:gitgutter_close_preview_on_escape| and use <Esc>.
+
+                        Two functions are available for your own logic:
+>
+                          gitgutter#hunk#is_preview_window_open()
+                          gitgutter#hunk#close_hunk_preview_window()
+<
+
 Commands for folds:~
 
                                                      *gitgutter-:GitGutterFold*
diff --git a/sources_non_forked/vim-gitgutter/plugin/gitgutter.vim b/sources_non_forked/vim-gitgutter/plugin/gitgutter.vim
index 8bef52d5..2be74c10 100755
--- a/sources_non_forked/vim-gitgutter/plugin/gitgutter.vim
+++ b/sources_non_forked/vim-gitgutter/plugin/gitgutter.vim
@@ -8,7 +8,7 @@ let g:loaded_gitgutter = 1
 " Initialisation {{{
 
 if v:version < 703 || (v:version == 703 && !has("patch105"))
-  call gitgutter#utility#warn('requires Vim 7.3.105')
+  call gitgutter#utility#warn('Requires Vim 7.3.105')
   finish
 endif
 
@@ -25,7 +25,8 @@ let g:gitgutter_preview_win_location = get(g:, 'gitgutter_preview_win_location',
 if exists('*nvim_open_win')
   let g:gitgutter_preview_win_floating = get(g:, 'gitgutter_preview_win_floating', 1)
 else
-  let g:gitgutter_preview_win_floating = get(g:, 'gitgutter_preview_win_floating', 0)
+  let default = exists('&previewpopup') ? !empty(&previewpopup) : 0
+  let g:gitgutter_preview_win_floating = get(g:, 'gitgutter_preview_win_floating', default)
 endif
 let g:gitgutter_enabled = get(g:, 'gitgutter_enabled', 1)
 if exists('*sign_unplace')
@@ -71,7 +72,7 @@ let g:gitgutter_show_msg_on_hunk_jumping     = get(g:, 'gitgutter_show_msg_on_hu
 let g:gitgutter_git_executable = get(g:, 'gitgutter_git_executable', 'git')
 if !executable(g:gitgutter_git_executable)
   if g:gitgutter_enabled
-    call gitgutter#utility#warn('cannot find git. Please set g:gitgutter_git_executable.')
+    call gitgutter#utility#warn('Cannot find git. Please set g:gitgutter_git_executable.')
   endif
   finish
 endif
@@ -85,7 +86,7 @@ if !empty(g:gitgutter_grep)
     endif
   else
     if g:gitgutter_grep !=# default_grep
-      call gitgutter#utility#warn('cannot find '.g:gitgutter_grep.'. Please check g:gitgutter_grep.')
+      call gitgutter#utility#warn('Cannot find '.g:gitgutter_grep.'. Please check g:gitgutter_grep.')
     endif
     let g:gitgutter_grep = ''
   endif
@@ -202,18 +203,18 @@ command! -bar GitGutterDebug call gitgutter#debug#debug()
 " Maps {{{
 
 nnoremap <silent> <expr> <Plug>(GitGutterNextHunk) &diff ? ']c' : ":\<C-U>execute v:count1 . 'GitGutterNextHunk'\<CR>"
-nnoremap <silent> <expr> <Plug>GitGutterNextHunk   &diff ? ']c' : ":\<C-U>call gitgutter#utility#warn('please change your map \<lt>Plug>GitGutterNextHunk to \<lt>Plug>(GitGutterNextHunk)')\<CR>"
+nnoremap <silent> <expr> <Plug>GitGutterNextHunk   &diff ? ']c' : ":\<C-U>call gitgutter#utility#warn('Please change your map \<lt>Plug>GitGutterNextHunk to \<lt>Plug>(GitGutterNextHunk)')\<CR>"
 nnoremap <silent> <expr> <Plug>(GitGutterPrevHunk) &diff ? '[c' : ":\<C-U>execute v:count1 . 'GitGutterPrevHunk'\<CR>"
-nnoremap <silent> <expr> <Plug>GitGutterPrevHunk   &diff ? '[c' : ":\<C-U>call gitgutter#utility#warn('please change your map \<lt>Plug>GitGutterPrevHunk to \<lt>Plug>(GitGutterPrevHunk)')\<CR>"
+nnoremap <silent> <expr> <Plug>GitGutterPrevHunk   &diff ? '[c' : ":\<C-U>call gitgutter#utility#warn('Please change your map \<lt>Plug>GitGutterPrevHunk to \<lt>Plug>(GitGutterPrevHunk)')\<CR>"
 
 xnoremap <silent> <Plug>(GitGutterStageHunk)   :GitGutterStageHunk<CR>
-xnoremap <silent> <Plug>GitGutterStageHunk     :call gitgutter#utility#warn('please change your map <lt>Plug>GitGutterStageHunk to <lt>Plug>(GitGutterStageHunk)')<CR>
+xnoremap <silent> <Plug>GitGutterStageHunk     :call gitgutter#utility#warn('Please change your map <lt>Plug>GitGutterStageHunk to <lt>Plug>(GitGutterStageHunk)')<CR>
 nnoremap <silent> <Plug>(GitGutterStageHunk)   :GitGutterStageHunk<CR>
-nnoremap <silent> <Plug>GitGutterStageHunk     :call gitgutter#utility#warn('please change your map <lt>Plug>GitGutterStageHunk to <lt>Plug>(GitGutterStageHunk)')<CR>
+nnoremap <silent> <Plug>GitGutterStageHunk     :call gitgutter#utility#warn('Please change your map <lt>Plug>GitGutterStageHunk to <lt>Plug>(GitGutterStageHunk)')<CR>
 nnoremap <silent> <Plug>(GitGutterUndoHunk)    :GitGutterUndoHunk<CR>
-nnoremap <silent> <Plug>GitGutterUndoHunk      :call gitgutter#utility#warn('please change your map <lt>Plug>GitGutterUndoHunk to <lt>Plug>(GitGutterUndoHunk)')<CR>
+nnoremap <silent> <Plug>GitGutterUndoHunk      :call gitgutter#utility#warn('Please change your map <lt>Plug>GitGutterUndoHunk to <lt>Plug>(GitGutterUndoHunk)')<CR>
 nnoremap <silent> <Plug>(GitGutterPreviewHunk) :GitGutterPreviewHunk<CR>
-nnoremap <silent> <Plug>GitGutterPreviewHunk   :call gitgutter#utility#warn('please change your map <lt>Plug>GitGutterPreviewHunk to <lt>Plug>(GitGutterPreviewHunk)')<CR>
+nnoremap <silent> <Plug>GitGutterPreviewHunk   :call gitgutter#utility#warn('Please change your map <lt>Plug>GitGutterPreviewHunk to <lt>Plug>(GitGutterPreviewHunk)')<CR>
 
 " }}}
 
diff --git a/sources_non_forked/vim-javascript/syntax/javascript.vim b/sources_non_forked/vim-javascript/syntax/javascript.vim
index 6a13434a..76c575ee 100755
--- a/sources_non_forked/vim-javascript/syntax/javascript.vim
+++ b/sources_non_forked/vim-javascript/syntax/javascript.vim
@@ -54,7 +54,7 @@ syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=
 syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+  contains=jsSpecial extend
 syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial extend
 syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
-syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\x\+\)\>/
+syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\%(\x\|_\)\+\)n\=\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\c\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%(e[+-]\=\d\+\)\=\>/
 
@@ -104,13 +104,13 @@ syntax keyword jsDo                     do              skipwhite skipempty next
 syntax region  jsSwitchCase   contained matchgroup=jsLabel start=/\<\%(case\|default\)\>/ end=/:\@=/ contains=@jsExpression,jsLabel skipwhite skipempty nextgroup=jsSwitchColon keepend
 syntax keyword jsTry                    try             skipwhite skipempty nextgroup=jsTryCatchBlock
 syntax keyword jsFinally      contained finally         skipwhite skipempty nextgroup=jsFinallyBlock
-syntax keyword jsCatch        contained catch           skipwhite skipempty nextgroup=jsParenCatch
+syntax keyword jsCatch        contained catch           skipwhite skipempty nextgroup=jsParenCatch,jsTryCatchBlock
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
-syntax keyword jsGlobalObjects     ArrayBuffer Array BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window
+syntax keyword jsGlobalObjects     ArrayBuffer Array BigInt BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakRef WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window
 syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
 syntax match   jsGlobalNodeObjects  /\<require\>/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
diff --git a/sources_non_forked/vim-ruby/spec/syntax/symbols_spec.rb b/sources_non_forked/vim-ruby/spec/syntax/symbols_spec.rb
index b0aad72e..92b314b7 100755
--- a/sources_non_forked/vim-ruby/spec/syntax/symbols_spec.rb
+++ b/sources_non_forked/vim-ruby/spec/syntax/symbols_spec.rb
@@ -42,4 +42,12 @@ describe "Syntax highlighting" do
       validates_inclusion_of :gender, in: %w(male female), if: :gender_required?
     EOF
   end
+
+  specify "nested parentheses inside symbols" do
+    assert_correct_highlighting <<~EOF, 'bar\zs)', 'rubySymbol'
+      h = %i(
+        foo(bar)baz
+      )
+    EOF
+  end
 end
diff --git a/sources_non_forked/vim-ruby/spec/vim/plugin/syntax_test.vim b/sources_non_forked/vim-ruby/spec/vim/plugin/syntax_test.vim
index db84204c..6b9bb74c 100755
--- a/sources_non_forked/vim-ruby/spec/vim/plugin/syntax_test.vim
+++ b/sources_non_forked/vim-ruby/spec/vim/plugin/syntax_test.vim
@@ -2,7 +2,7 @@
 let s:debug = 0
 
 function! s:CursorHasGroup(group) abort
-  return synIDattr(synID(line('.'), col('.'), 0), 'name') =~ a:group
+  return synIDattr(synID(line('.'), col('.'), 1), 'name') =~ a:group
 endfunction
 
 function! TestSyntax(pattern, group) abort
diff --git a/sources_non_forked/vim-ruby/syntax/ruby.vim b/sources_non_forked/vim-ruby/syntax/ruby.vim
index d797e46b..149f13cf 100755
--- a/sources_non_forked/vim-ruby/syntax/ruby.vim
+++ b/sources_non_forked/vim-ruby/syntax/ruby.vim
@@ -133,10 +133,10 @@ syn match rubyCurlyBraceEscape	  "\\[{}]"  contained display
 syn match rubyAngleBracketEscape  "\\[<>]"  contained display
 syn match rubySquareBracketEscape "\\[[\]]" contained display
 
-syn region rubyNestedParentheses    start="("  skip="\\\\\|\\)"  matchgroup=rubyString end=")"	transparent contained
-syn region rubyNestedCurlyBraces    start="{"  skip="\\\\\|\\}"  matchgroup=rubyString end="}"	transparent contained
-syn region rubyNestedAngleBrackets  start="<"  skip="\\\\\|\\>"  matchgroup=rubyString end=">"	transparent contained
-syn region rubyNestedSquareBrackets start="\[" skip="\\\\\|\\\]" matchgroup=rubyString end="\]"	transparent contained
+syn region rubyNestedParentheses    start="("  skip="\\\\\|\\)"  end=")"	transparent contained
+syn region rubyNestedCurlyBraces    start="{"  skip="\\\\\|\\}"  end="}"	transparent contained
+syn region rubyNestedAngleBrackets  start="<"  skip="\\\\\|\\>"  end=">"	transparent contained
+syn region rubyNestedSquareBrackets start="\[" skip="\\\\\|\\\]" end="\]"	transparent contained
 
 syn cluster rubySingleCharEscape contains=rubyBackslashEscape,rubyQuoteEscape,rubySpaceEscape,rubyParenthesisEscape,rubyCurlyBraceEscape,rubyAngleBracketEscape,rubySquareBracketEscape
 syn cluster rubyNestedBrackets	 contains=rubyNested.\+
diff --git a/sources_non_forked/vim-snipmate/doc/SnipMate.txt b/sources_non_forked/vim-snipmate/doc/SnipMate.txt
index 52cc5b83..62265a00 100755
--- a/sources_non_forked/vim-snipmate/doc/SnipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/SnipMate.txt
@@ -532,7 +532,7 @@ sources such as creating snippets on the fly representing python function
 definitions found in the current file.
 
 Example 2:~
-Add to your ~/.vimrc: For each know snippet add a second version ending in _
+Add to your ~/.vimrc: For each new snippet add a second version ending in _
 adding folding markers >
 
     let g:commentChar = {
diff --git a/sources_non_forked/vim-snippets/UltiSnips/gitcommit.snippets b/sources_non_forked/vim-snippets/UltiSnips/gitcommit.snippets
new file mode 100644
index 00000000..938071c2
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/gitcommit.snippets
@@ -0,0 +1,61 @@
+# https://www.conventionalcommits.org/en/v1.0.0-beta.2/#specification
+
+snippet fix "fix conventional commit"
+fix(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet feat "feat conventional commit"
+feat(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet chore "chore conventional commit"
+chore(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet docs "docs conventional commit"
+docs(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet improvement "improvement conventional commit"
+improvement(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet perf "perf conventional commit"
+perf(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet refactor "refactor conventional commit"
+refactor(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet test "test conventional commit"
+test(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet ci "ci conventional commit"
+ci(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet build "build conventional commit"
+build(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_react.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_react.snippets
index 666c80e3..ee70ff0f 100755
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_react.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_react.snippets
@@ -1,3 +1,11 @@
+global !p
+# Capitalize the first letter without affecting the rest of the letters
+def capitalize_first(word):
+	if(word):
+		word = word[0].upper() + word[1:]
+	return word
+endglobal
+
 # Functional components
 snippet rfc "react functional component" b
 import React, {useState} from "react"
@@ -14,7 +22,7 @@ export default $4`!p snip.rv = snip.basename`
 endsnippet
 # React Hooks
 snippet useS "useState Hook" b
-const [${1}, set`!p snip.rv=t[1].title()`] = useState(${3:"${4}"})
+const [${1}, set`!p snip.rv=capitalize_first(t[1])`] = useState(${3:"${4}"})
 endsnippet
 snippet useE "useEffect Hook" b
 useEffect(() => {
diff --git a/sources_non_forked/vim-snippets/UltiSnips/julia.snippets b/sources_non_forked/vim-snippets/UltiSnips/julia.snippets
index 259c5f4c..e0b4a9a8 100755
--- a/sources_non_forked/vim-snippets/UltiSnips/julia.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/julia.snippets
@@ -32,3 +32,12 @@ endsnippet
 snippet fld "type field documentation" b
 #' @field ${1:name}::${2:Type} ${0:Description}
 endsnippet
+
+# Debugging
+snippet deb "Debugger breakpoint" b
+Main.@bp
+endsnippet
+
+snippet inf "Infiltrator breakpoint" b
+Main.@infiltrate
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/lua.snippets b/sources_non_forked/vim-snippets/UltiSnips/lua.snippets
index 0fd5eefc..ac604a09 100755
--- a/sources_non_forked/vim-snippets/UltiSnips/lua.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/lua.snippets
@@ -8,6 +8,15 @@ snippet #! "#!/usr/bin/env lua" b
 $0
 endsnippet
 
+snippet assert "Assertion" b
+assert(${1:condition}`!p
+if t[2]:
+	snip.rv = ", "
+else:
+	snip.rv = ""
+`${2:msg})
+endsnippet
+
 snippet !fun(ction)?! "New function" br
 function ${1:new_function}(${2:args})
 	$0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
index 6e775041..4923af5c 100755
--- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
@@ -138,7 +138,7 @@ def format_arg(arg, style):
 	elif style == NORMAL:
 		return ":%s: TODO" % arg
 	elif style == GOOGLE:
-		return "%s (TODO): TODO" % arg
+		return "%s (%s): TODO" % (arg, arg.type or "TODO")
 	elif style == JEDI:
 		return ":type %s: TODO" % arg
 	elif style == NUMPY:
diff --git a/sources_non_forked/vim-snippets/snippets/cuda.snippets b/sources_non_forked/vim-snippets/snippets/cuda.snippets
index 425ca67f..2fc19218 100755
--- a/sources_non_forked/vim-snippets/snippets/cuda.snippets
+++ b/sources_non_forked/vim-snippets/snippets/cuda.snippets
@@ -1 +1,59 @@
 extends cpp
+
+snippet kern "Kernel definition"
+	__global__ void ${1:kernel}(${2:void}) {
+		${0:// TODO: Implement}
+	}
+
+snippet dev "Device function definition"
+	__device__ ${1:int} ${2:foo}(${3:void}) {
+		${0:// TODO: Implement}
+		return 0;
+	}
+	
+snippet call "Kernel call"
+	${1:kernel}<<<${2:args}>>>(${3});${0}
+
+snippet sync "Synchonize threads"
+	__syncthreads();
+
+snippet tid "Thread Index"
+	threadIdx.${0}
+
+snippet bid "Block Index"
+	blockIdx.${0}
+
+snippet bdim "Block Dimension"
+	blockDim.${0}
+
+snippet ii "Get current index (1D)"
+	int ${1:index} = threadIdx.${2:x} + blockIdx.$2 * blockDim.$2;
+
+snippet ix "Get current X index (1D)"
+	int ${1:x} = threadIdx.x + blockIdx.x * blockDim.x;
+
+snippet iy "Get current Y index (1D)"
+	int ${1:y} = threadIdx.y + blockIdx.y * blockDim.y;
+
+snippet iz "Get current Z index (1D)"
+	int ${1:z} = threadIdx.z + blockIdx.z * blockDim.z;
+
+snippet ixy "Get current X,Y index (2D)"
+	int ${1:x} = threadIdx.x + blockIdx.x * blockDim.x;
+	int ${2:y} = threadIdx.y + blockIdx.y * blockDim.y;
+
+snippet ixz "Get current X,Z index (2D)"
+	int ${1:x} = threadIdx.x + blockIdx.x * blockDim.x;
+	int ${3:z} = threadIdx.z + blockIdx.z * blockDim.z;
+
+snippet iyz "Get current Y,Z index (2D)"
+	int ${2:y} = threadIdx.y + blockIdx.y * blockDim.y;
+	int ${3:z} = threadIdx.z + blockIdx.z * blockDim.z;
+
+snippet ixyz "Get current X,Y,Z index (3D)"
+	int ${1:x} = threadIdx.x + blockIdx.x * blockDim.x;
+	int ${2:y} = threadIdx.y + blockIdx.y * blockDim.y;
+	int ${3:z} = threadIdx.z + blockIdx.z * blockDim.z;
+
+snippet share "Shared memory declaration"
+	__shared__ ${1:int} ${2:memo}[${3:SIZE}];${0}
diff --git a/sources_non_forked/vim-snippets/snippets/fsharp.snippets b/sources_non_forked/vim-snippets/snippets/fsharp.snippets
new file mode 100644
index 00000000..81587d65
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/fsharp.snippets
@@ -0,0 +1,80 @@
+snippet doc
+	/// ${0}
+snippet comment
+	// ${0}
+snippet let
+	let ${1} = ${0}
+snippet lit
+	[<Literal>]
+	let ${1} = ${0}
+snippet rec
+	type ${1} = { ${0} }
+snippet arec
+	{| ${0} |}
+snippet fn
+	let ${1} =
+		${0}
+snippet fnr
+	let rec ${1} =
+		${0}
+snippet lam
+	(fun ${1} -> ${0})
+snippet mod
+	module ${1} =
+		${0}
+snippet for
+	for ${1} in ${2} do
+		${0}
+snippet if
+	if ${1} then
+		${2}
+snippet ife
+	if ${1} then
+		${2}
+	else
+		${0}
+snippet ifee
+	if ${1} then
+		${2}
+	elif ${3} then
+		${4}
+	else
+		${0}
+snippet eif
+	elif ${1} then
+		${0}
+snippet el
+	else
+		${0}
+snippet try
+	try
+		${1}
+	with ${0}
+snippet match
+	match ${1} with
+	| ${2} -> ${0}
+snippet |
+	| ${1} -> ${0}
+snippet p
+	|> ${0}
+snippet pr
+	printfn "${1}" ${0}
+snippet pri
+	printfn \$"${0}"
+snippet amap
+	|> Array.map (fun ${1} -> ${0})
+snippet lmap
+	|> List.map (fun ${1} -> ${0})
+snippet smap
+	|> Seq.map (fun ${1} -> ${0})
+snippet atap
+	|> Array.map (fun x -> printfn "%A" x; x) // tap
+snippet ltap
+	|> List.map (fun x -> printfn "%A" x; x) // tap
+snippet stap
+	|> Seq.map (fun x -> printfn "%A" x; x) // tap
+snippet main
+	[<EntryPoint>]
+	let main argv =
+		${0}
+		0
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index 640a26fa..bc4599e3 100755
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -449,7 +449,7 @@ snippet html5
 	</html>
 snippet html5l
 	<!DOCTYPE html>
-	<html lang="${1:es}">
+	<html lang="${1:en}">
 		<head>
 			<meta charset="utf-8">
 			<meta name="viewport" content="width=device-width">
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
index dcf37a4e..9649bdce 100755
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
@@ -99,11 +99,11 @@ snippet terr
 snippet ret
 	return ${0:result};
 snippet for "for (...) {...}"
-	for (var ${1:i} = 0, ${2:len} = ${3:Things.length}; $1 < $2; $1++) {
+	for (let ${1:i} = 0, ${2:len} = ${3:Things.length}; $1 < $2; $1++) {
 		${0:${VISUAL}}
 	}
 snippet forr "reversed for (...) {...}"
-	for (var ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
+	for (let ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
 		${0:${VISUAL}}
 	}
 snippet wh "(condition) { ... }"
@@ -116,7 +116,7 @@ snippet do "do { ... } while (condition)"
 	} while (${1:/* condition */});
 # For in loop
 snippet fori
-	for (var ${1:prop} in ${2:object}) {
+	for (let ${1:prop} in ${2:object}) {
 		${0:$2[$1]}
 	}
 # Objects
diff --git a/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index cd1224df..891f905f 100755
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -241,7 +241,7 @@ snippet addsp
 snippet addarg
 	parser.add_argument("${0:short_arg}", "${1:long_arg}", default=${2:None}, help="${3:Help text}")
 snippet addnarg
-	parser.add_argument("${0:arg}", nargs="${1:*}", default"${2:None}, help="${3:Help text}")
+	parser.add_argument("${0:arg}", nargs="${1:*}", default=${2:None}, help="${3:Help text}")
 snippet addaarg
 	parser.add_argument("${0:arg}", "${1:long_arg}", action="${2:store_true}", default=${3:False}, help="${4:Help text}")
 snippet pargs
diff --git a/sources_non_forked/vim-snippets/snippets/rust.snippets b/sources_non_forked/vim-snippets/snippets/rust.snippets
index 71fe5909..5e9eb2b1 100755
--- a/sources_non_forked/vim-snippets/snippets/rust.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rust.snippets
@@ -101,7 +101,7 @@ snippet crate "Define create meta attributes"
 	// Crate name
 	#![crate_name = "${1:crate_name}"]
 	// Additional metadata attributes
-	#![desc = "${2:Descrption.}"]
+	#![desc = "${2:Description.}"]
 	#![license = "${3:BSD}"]
 	#![comment = "${4:Comment.}"]
 	// Specify the output type
diff --git a/sources_non_forked/vim-snippets/snippets/verilog.snippets b/sources_non_forked/vim-snippets/snippets/verilog.snippets
index e4a6b052..16bacc2a 100755
--- a/sources_non_forked/vim-snippets/snippets/verilog.snippets
+++ b/sources_non_forked/vim-snippets/snippets/verilog.snippets
@@ -58,7 +58,7 @@ snippet al
 	end
 # Module block
 snippet mod
-	module ${1:module_name} (${2});
+	module ${1:`vim_snippets#Filename('$1', 'name')`} (${2});
 		${0}
 	endmodule
 # For
@@ -81,3 +81,19 @@ snippet task
 	task ${1:name}(${2});
 		${0}
 	endtask: $1
+# Initial 
+snippet ini
+	initial begin
+		${0}
+	end
+# typedef struct packed
+snippet tdsp
+	typedef struct packed {
+		int ${2:data};
+	} ${1:`vim_snippets#Filename('$1_t', 'name')`};
+# typedef eum
+snippet tde
+	typedef enum ${2:logic[15:0]}
+	{
+		${3:REG = 16'h0000}
+	} ${1:my_dest_t};
diff --git a/sources_non_forked/vim-snippets/snippets/vim.snippets b/sources_non_forked/vim-snippets/snippets/vim.snippets
index b3715036..ec43a02c 100755
--- a/sources_non_forked/vim-snippets/snippets/vim.snippets
+++ b/sources_non_forked/vim-snippets/snippets/vim.snippets
@@ -43,8 +43,17 @@ snippet ife if ... else statement
 	endif
 snippet au augroup ... autocmd block
 	augroup ${1:AU_NAME}
+		autocmd!
 		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}
 	augroup END
+<<<<<<< HEAD
+=======
+snippet auv augroupvisual ... autocmd block with visual placeholder
+	augroup ${1:AU_NAME}
+		autocmd!
+		${0:${VISUAL}}
+	augroup END
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 snippet bun Vundle.vim Plugin definition
 	Plugin '${0}'
 snippet plug vim-plug Plugin definition
diff --git a/sources_non_forked/vim-snippets/snippets/vue.snippets b/sources_non_forked/vim-snippets/snippets/vue.snippets
index 61c06af6..1385ecb7 100755
--- a/sources_non_forked/vim-snippets/snippets/vue.snippets
+++ b/sources_non_forked/vim-snippets/snippets/vue.snippets
@@ -118,7 +118,7 @@ snippet vfilter
 snippet vfor
 	<div v-for="${1:item} in ${2:items}" :key="$1.id">
 		{{ $1 }}
-	</div
+	</div>
 
 snippet vgetters
 	getters: {
diff --git a/update_plugins.py b/update_plugins.py
index 606fba04..37abdc99 100755
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -57,6 +57,7 @@ vim-ruby https://github.com/vim-ruby/vim-ruby
 typescript-vim https://github.com/leafgarland/typescript-vim
 vim-javascript https://github.com/pangloss/vim-javascript
 vim-python-pep8-indent https://github.com/Vimjas/vim-python-pep8-indent
+mru.vim https://github.com/vim-scripts/mru.vim
 """.strip()
 
 GITHUB_ZIP = "%s/archive/master.zip"
diff --git a/vimrcs/filetypes.vim b/vimrcs/filetypes.vim
index 522bafd6..19c6a4e3 100755
--- a/vimrcs/filetypes.vim
+++ b/vimrcs/filetypes.vim
@@ -26,11 +26,11 @@ au FileType javascript call JavaScriptFold()
 au FileType javascript setl fen
 au FileType javascript setl nocindent
 
-au FileType javascript imap <C-t> $log();<esc>hi
-au FileType javascript imap <C-a> alert();<esc>hi
+au FileType javascript,typescript imap <C-t> console.log();<esc>hi
+au FileType javascript,typescript imap <C-a> alert();<esc>hi
 
-au FileType javascript inoremap <buffer> $r return 
-au FileType javascript inoremap <buffer> $f // --- PH<esc>FP2xi
+au FileType javascript,typescript inoremap <buffer> $r return 
+au FileType javascript,typescript inoremap <buffer> $f // --- PH<esc>FP2xi
 
 function! JavaScriptFold() 
     setl foldmethod=syntax
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index ccf24baa..051f87a3 100755
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -53,9 +53,6 @@ map <leader>j :CtrlP<cr>
 " Quickly find and open a buffer
 map <leader>b :CtrlPBuffer<cr>
 
-" Quickly find and open a recently opened file
-map <leader>f :CtrlPMRU<CR>
-
 let g:ctrlp_max_height = 20
 let g:ctrlp_custom_ignore = 'node_modules\|^\.DS_Store\|^\.git\|^\.coffee'
 
@@ -73,6 +70,7 @@ let g:user_zen_mode='a'
 let g:snipMate = { 'snippet_version' : 1  }
 ino <C-j> <C-r>=snipMate#TriggerSnippet()<cr>
 snor <C-j> <esc>i<right><C-r>=snipMate#TriggerSnippet()<cr>
+let g:snipMate = { 'snippet_version' : 1 }
 
 
 """"""""""""""""""""""""""""""