Change the default plugin directory for Neovim

And suggest users to call plug#begin() without an argument to avoid confusion.
README: Clarify recommended plugins directory for Windows Vim (#1151 )
2025-12-07 17:44:25 +08:00 · 2022-01-03 23:05:08 +09:00 · 2022-01-03 22:47:53 +09:00 · 2021-12-06 14:26:19 +09:00 · 2021-12-05 23:42:23 +09:00 · 2021-08-31 17:14:37 +09:00
9 changed files with 755 additions and 252 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -0,0 +1,52 @@
+---
+name: Test vim-plug
+
+on:
+  push:
+    branches: [master, devel]
+  pull_request:
+    branches: [master]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        vim:
+          - vim
+          # FIXME: (core dumped) https://github.com/junegunn/vim-plug/runs/4422576984?check_suite_focus=true#step:3:238
+          # - neovim-stable
+          # - neovim-unstable
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install packages and test
+        env:
+          ENV: ${{ matrix.vim }}
+        run: |
+          export DEPS=~/deps
+          export PATH=~/deps/bin:$PATH
+
+          git config --global user.email "you@example.com"
+          git config --global user.name "Your Name"
+
+          case "$ENV" in
+            vim)
+              sudo apt-get install vim
+              ;;
+            neovim-*)
+              sudo add-apt-repository ppa:neovim-ppa/${ENV/neovim-/}
+              sudo apt-get update
+              sudo apt-get install neovim
+
+              mkdir -p $DEPS/bin
+              echo 'nvim "$@"' > $DEPS/bin/vim
+              chmod +x $DEPS/bin/vim
+              export VADER_OUTPUT_FILE=/dev/stderr
+              ;;
+          esac
+
+          test/run !
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,54 +1,63 @@
-language: ruby
-dist: trusty
-sudo: false
+language: minimal
 env:
  global:
    - DEPS=$HOME/deps
    - PATH=$DEPS/bin:$PATH
-matrix:
+jobs:
  include:
-    - env: ENV=vim72
-      rvm: 1.8.7
-      addons: { apt: { packages: [vim-nox] } }
-    - env: ENV=python
-      rvm: 1.8.7
-      addons: { apt: { packages: [python2.7-dev] } }
-    - env: ENV=python3
-      rvm: 1.8.7
-      addons: { apt: { packages: [python3-dev] } }
-    - env: ENV=ruby18
-      rvm: 1.8.7
-    - env: ENV=ruby20
-      rvm: 2.0.0
-    - env: ENV=neovim
-    - env: ENV=vim8
+    - env: ENV=vim80-bionic
+      dist: bionic
+      stage: vim8
+    - env: ENV=vim-nightly
+      dist: trusty
+      stage: vim8
+    - env: ENV=neovim-stable
+      dist: bionic
+      addons: {apt: {packages: [neovim], sources: [{sourceline: 'ppa:neovim-ppa/stable'}]}}
+      stage: neovim
+    - env: ENV=neovim-nightly
+      dist: bionic
+      addons: {apt: {packages: [neovim], sources: [{sourceline: 'ppa:neovim-ppa/unstable'}]}}
+      stage: neovim
+    - env: ENV=vim74-trusty-python
+      dist: trusty
+      stage: vim74
+    - env: ENV=vim74-xenial-python3
+      dist: xenial
+      stage: vim74
+    - env: ENV=vim74-trusty-ruby
+      dist: trusty
+      addons: {apt: {packages: [vim-nox]}}
+      stage: vim74
+    - env: ENV=vim74-xenial-ruby
+      dist: xenial
+      addons: {apt: {packages: [vim-nox]}}
+      stage: vim74
+    - env: ENV=osx-highsierra
+      os: osx
+      osx_image: xcode9.4
+      stage: vim8
 install: |
  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

-  if [ "$ENV" == "vim72" ]; then
-    mkdir -p ${DEPS}/bin
-    ln -s /usr/bin/vim.nox ${DEPS}/bin/vim
-    return
-  elif [ "$ENV" == "neovim" ]; then
-    # https://github.com/neovim/bot-ci#nightly-builds
-    eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) nightly-x64"
-    mkdir -p ${DEPS}/bin
-    ln -s $(which nvim) ${DEPS}/bin/vim
-    export VADER_OUTPUT_FILE=/dev/stderr
-    return
-  fi
-
  C_OPTS="--prefix=$DEPS --with-features=huge --disable-gui "
  case "$ENV" in
-    python)
-      C_OPTS+=--enable-pythoninterp
+    vim-*)
      ;;
-    python3)
-      C_OPTS+=--enable-python3interp
+    neovim-*)
+      mkdir -p ${DEPS}/bin
+      ln -s /usr/bin/nvim ${DEPS}/bin/vim
+      export VADER_OUTPUT_FILE=/dev/stderr
+      return
      ;;
-    ruby*)
-      C_OPTS+=--enable-rubyinterp
+    vim74-* | vim80-*)
+      mkdir -p ${DEPS}/bin
+      ln -s /usr/bin/vim.nox ${DEPS}/bin/vim
+      return
+      ;;
+    *)
+      return
      ;;
  esac

--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ A minimalist Vim plugin manager.

 ### Pros.

- Easier to setup: Single file. No boilerplate code required.
- Easier to use: Concise, intuitive syntax
+- Easy to set up: Single file. No boilerplate code required.
+- Easy to use: Concise, intuitive syntax
 - [Super-fast][40/4] parallel installation/update
  (with any of `+job`, `+python`, `+python3`, `+ruby`, or [Neovim][nv])
 - Creates shallow clones to minimize disk space usage and download time
@@ -44,36 +44,31 @@ file as suggested [here][auto].
 ###### Windows (PowerShell)

 ```powershell
-md ~\vimfiles\autoload
-$uri = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-(New-Object Net.WebClient).DownloadFile(
-  $uri,
-  $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath(
-    "~\vimfiles\autoload\plug.vim"
-  )
-)
+iwr -useb https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim |`
+    ni $HOME/vimfiles/autoload/plug.vim -Force
 ```

 #### Neovim

-###### Unix
+###### Unix, Linux

 ```sh
-curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \
+sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+```
+
+###### Linux (Flatpak)
+
+```sh
+curl -fLo ~/.var/app/io.neovim.nvim/data/nvim/site/autoload/plug.vim --create-dirs \
    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 ```

 ###### Windows (PowerShell)

 ```powershell
-md ~\AppData\Local\nvim\autoload
-$uri = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-(New-Object Net.WebClient).DownloadFile(
-  $uri,
-  $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath(
-    "~\AppData\Local\nvim\autoload\plug.vim"
-  )
-)
+iwr -useb https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim |`
+    ni "$(@($env:XDG_DATA_HOME, $env:LOCALAPPDATA)[$null -eq $env:XDG_DATA_HOME])/nvim-data/site/autoload/plug.vim" -Force
 ```

 ### Getting Help
@@ -90,9 +85,9 @@ $uri = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'

 ### Usage

-Add a vim-plug section to your `~/.vimrc` (or `~/.config/nvim/init.vim` for Neovim):
+Add a vim-plug section to your `~/.vimrc` (or `stdpath('config') . '/init.vim'` for Neovim)

-1. Begin the section with `call plug#begin()`
+1. Begin the section with `call plug#begin([PLUGIN_DIR])`
 1. List the plugins with `Plug` commands
 1. `call plug#end()` to update `&runtimepath` and initialize plugin system
    - Automatically executes `filetype plugin indent on` and `syntax enable`.
@@ -101,10 +96,14 @@ Add a vim-plug section to your `~/.vimrc` (or `~/.config/nvim/init.vim` for Neov
 #### Example

 ```vim
-" Specify a directory for plugins
-" - For Neovim: ~/.local/share/nvim/plugged
-" - Avoid using standard Vim directory names like 'plugin'
-call plug#begin('~/.vim/plugged')
+call plug#begin()
+" The default plugin directory will be as follows:
+"   - Vim (Linux/macOS): '~/.vim/plugged'
+"   - Vim (Windows): '~/vimfiles/plugged'
+"   - Neovim (Linux/macOS/Windows): stdpath('data') . '/plugged'
+" You can specify a custom plugin directory by passing it as the argument
+"   - e.g. `call plug#begin('~/.vim/plugged')`
+"   - Avoid using standard Vim directory names like 'plugin'

 " Make sure you use single quotes

@@ -121,7 +120,7 @@ Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
 Plug 'tpope/vim-fireplace', { 'for': 'clojure' }

-" Using a non-master branch
+" Using a non-default branch
 Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }

 " Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
@@ -148,7 +147,7 @@ Reload .vimrc and `:PlugInstall` to install plugins.
 | ----------------------------------- | ------------------------------------------------------------------ |
 | `PlugInstall [name ...] [#threads]` | Install plugins                                                    |
 | `PlugUpdate [name ...] [#threads]`  | Install or update plugins                                          |
-| `PlugClean[!]`                      | Remove unused directories (bang version will clean without prompt) |
+| `PlugClean[!]`                      | Remove unlisted plugins (bang version will clean without prompt) |
 | `PlugUpgrade`                       | Upgrade vim-plug itself                                            |
 | `PlugStatus`                        | Check the status of plugins                                        |
 | `PlugDiff`                          | Examine changes from the previous update and the pending changes   |
@@ -223,18 +222,18 @@ Plug 'junegunn/goyo.vim', { 'for': 'markdown' }
 autocmd! User goyo.vim echom 'Goyo is now loaded!'
 ```

-`for` option is generally not needed as most plugins for specific file types
-usually don't have too much code in `plugin` directory. You might want to
+The `for` option is generally not needed as most plugins for specific file types
+usually don't have too much code in the `plugin` directory. You might want to
 examine the output of `vim --startuptime` before applying the option.

 ### Post-update hooks

 There are some plugins that require extra steps after installation or update.
-In that case, use `do` option to describe the task to be performed.
+In that case, use the `do` option to describe the task to be performed.

 ```vim
 Plug 'Shougo/vimproc.vim', { 'do': 'make' }
-Plug 'Valloric/YouCompleteMe', { 'do': './install.py' }
+Plug 'ycm-core/YouCompleteMe', { 'do': './install.py' }
 ```

 If the value starts with `:`, it will be recognized as a Vim command.
@@ -257,7 +256,7 @@ function! BuildYCM(info)
  endif
 endfunction

-Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') }
+Plug 'ycm-core/YouCompleteMe', { 'do': function('BuildYCM') }
 ```

 Both forms of post-update hook are executed inside the directory of the plugin
@@ -265,7 +264,7 @@ and only run when the repository has changed, but you can force it to run
 unconditionally with the bang-versions of the commands: `PlugInstall!` and
 `PlugUpdate!`.

-Make sure to escape BARs and double-quotes when you write `do` option inline
+Make sure to escape BARs and double-quotes when you write the `do` option inline
 as they are mistakenly recognized as command separator or the start of the
 trailing comment.

@@ -291,7 +290,7 @@ The installer takes the following steps when installing/updating a plugin:
    1. Update submodules
    2. Execute post-update hooks

-The commands with `!` suffix ensure that all steps are run unconditionally.
+The commands with the `!` suffix ensure that all steps are run unconditionally.

 ### Articles

@@ -300,7 +299,11 @@ The commands with `!` suffix ensure that all steps are run unconditionally.
 - ~~[Thoughts on Vim plugin dependency](http://junegunn.kr/2013/09/thoughts-on-vim-plugin-dependency)~~
    - *Support for Plugfile has been removed since 0.5.0*

+### Collaborators
+
+- [Jan Edmund Lazo](https://github.com/janlazo) - Windows support
+- [Jeremy Pallats](https://github.com/starcraftman) - Python installer
+
 ### License

 MIT
-
--- a/doc/plug.txt
+++ b/doc/plug.txt
@@ -1,4 +1,4 @@
-plug.txt	plug	Last change: November 27 2017
+plug.txt	plug	Last change: January 3 2022
 PLUG - TABLE OF CONTENTS                                         *plug* *plug-toc*
 ==============================================================================

@@ -23,6 +23,7 @@ PLUG - TABLE OF CONTENTS                                         *plug* *plug-to
    Post-update hooks
    PlugInstall! and PlugUpdate!
    Articles
+    Collaborators
    License

 VIM-PLUG                                                              *vim-plug*
@@ -36,8 +37,8 @@ https://raw.githubusercontent.com/junegunn/i/master/vim-plug/installer.gif
 < Pros. >_____________________________________________________________________~
                                                                     *plug-pros*

- - Easier to setup: Single file. No boilerplate code required.
- - Easier to use: Concise, intuitive syntax
+ - Easy to set up: Single file. No boilerplate code required.
+ - Easy to use: Concise, intuitive syntax
 - {Super-fast}{1} parallel installation/update (with any of `+job`, `+python`,
   `+python3`, `+ruby`, or {Neovim}{2})
 - Creates shallow clones to minimize disk space usage and download time
@@ -77,14 +78,8 @@ file as suggested {here}{5}.

 >> Windows (PowerShell)~
 >
-    md ~\vimfiles\autoload
-    $uri = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-    (New-Object Net.WebClient).DownloadFile(
-      $uri,
-      $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath(
-        "~\vimfiles\autoload\plug.vim"
-      )
-    )
+    iwr -useb https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim |`
+        ni $HOME/vimfiles/autoload/plug.vim -Force
 <

 Neovim~
@@ -93,20 +88,14 @@ Neovim~

 >> Unix~
 >
-    curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \
-        https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+    sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+           https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
 <

 >> Windows (PowerShell)~
 >
-    md ~\AppData\Local\nvim\autoload
-    $uri = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-    (New-Object Net.WebClient).DownloadFile(
-      $uri,
-      $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath(
-        "~\AppData\Local\nvim\autoload\plug.vim"
-      )
-    )
+    iwr -useb https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim |`
+        ni "$(@($env:XDG_DATA_HOME, $env:LOCALAPPDATA)[$null -eq $env:XDG_DATA_HOME])/nvim-data/site/autoload/plug.vim" -Force
 <

 < Getting Help >______________________________________________________________~
@@ -127,12 +116,12 @@ Neovim~
 < Usage >_____________________________________________________________________~
                                                                    *plug-usage*

-Add a vim-plug section to your `~/.vimrc` (or `~/.config/nvim/init.vim` for
-Neovim):
+Add a vim-plug section to your `~/.vimrc` (or `stdpath('config') . '/init.vim'` for
+Neovim)

                                                           *plug#begin* *plug#end*

- 1. Begin the section with `call plug#begin()`
+ 1. Begin the section with `call plug#begin([PLUGIN_DIR])`
 2. List the plugins with `Plug` commands
 3. `call plug#end()` to update 'runtimepath' and initialize plugin system
   - Automatically executes `filetype plugin indent on` and `syntax enable`.
@@ -143,10 +132,14 @@ Neovim):
 Example~
                                                                  *plug-example*
 >
-    " Specify a directory for plugins
-    " - For Neovim: ~/.local/share/nvim/plugged
-    " - Avoid using standard Vim directory names like 'plugin'
-    call plug#begin('~/.vim/plugged')
+    call plug#begin()
+    " The default plugin directory will be as follows:
+    "   - Vim (Linux/macOS): '~/.vim/plugged'
+    "   - Vim (Windows): '~/vimfiles/plugged'
+    "   - Neovim (Linux/macOS/Windows): stdpath('data') . '/plugged'
+    " You can specify a custom plugin directory by passing it as the argument
+    "   - e.g. `call plug#begin('~/.vim/plugged')`
+    "   - Avoid using standard Vim directory names like 'plugin'

    " Make sure you use single quotes

@@ -163,7 +156,7 @@ Example~
    Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
    Plug 'tpope/vim-fireplace', { 'for': 'clojure' }

-    " Using a non-master branch
+    " Using a non-default branch
    Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }

    " Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
@@ -194,7 +187,7 @@ Reload .vimrc and `:PlugInstall` to install plugins.
 ------------------------------------+-------------------------------------------------------------------
  `PlugInstall [name ...] [#threads]`  | Install plugins
  `PlugUpdate [name ...] [#threads]`   | Install or update plugins
-  `PlugClean[!]`                       | Remove unused directories (bang version will clean without prompt)
+  `PlugClean[!]`                       | Remove unlisted plugins (bang version will clean without prompt)
  `PlugUpgrade`                        | Upgrade vim-plug itself
  `PlugStatus`                         | Check the status of plugins
  `PlugDiff`                           | Examine changes from the previous update and the pending changes
@@ -204,6 +197,7 @@ Reload .vimrc and `:PlugInstall` to install plugins.

 < Plug options >______________________________________________________________~
                                                                  *plug-options*
+                                                                         *:Plug*

 ------------------------+-----------------------------------------------
 Option                  | Description                                   ~
@@ -284,19 +278,19 @@ Reload .vimrc and `:PlugInstall` to install plugins.
    Plug 'junegunn/goyo.vim', { 'for': 'markdown' }
    autocmd! User goyo.vim echom 'Goyo is now loaded!'
 <
-`for` option is generally not needed as most plugins for specific file types
-usually don't have too much code in `plugin` directory. You might want to
-examine the output of `vim --startuptime` before applying the option.
+The `for` option is generally not needed as most plugins for specific file
+types usually don't have too much code in the `plugin` directory. You might
+want to examine the output of `vim --startuptime` before applying the option.


 < Post-update hooks >_________________________________________________________~
                                                        *plug-post-update-hooks*

 There are some plugins that require extra steps after installation or update.
-In that case, use `do` option to describe the task to be performed.
+In that case, use the `do` option to describe the task to be performed.
 >
    Plug 'Shougo/vimproc.vim', { 'do': 'make' }
-    Plug 'Valloric/YouCompleteMe', { 'do': './install.py' }
+    Plug 'ycm-core/YouCompleteMe', { 'do': './install.py' }
 <
 If the value starts with `:`, it will be recognized as a Vim command.

@@ -317,16 +311,16 @@ takes a single argument.
      endif
    endfunction

-    Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') }
+    Plug 'ycm-core/YouCompleteMe', { 'do': function('BuildYCM') }
 <
 Both forms of post-update hook are executed inside the directory of the plugin
 and only run when the repository has changed, but you can force it to run
 unconditionally with the bang-versions of the commands: `PlugInstall!` and
 `PlugUpdate!`.

-Make sure to escape BARs and double-quotes when you write `do` option inline
-as they are mistakenly recognized as command separator or the start of the
-trailing comment.
+Make sure to escape BARs and double-quotes when you write the `do` option
+inline as they are mistakenly recognized as command separator or the start of
+the trailing comment.
 >
    Plug 'junegunn/fzf', { 'do': 'yes \| ./install' }
 <
@@ -350,7 +344,8 @@ The installer takes the following steps when installing/updating a plugin:
   1. Update submodules
   2. Execute post-update hooks

-The commands with `!` suffix ensure that all steps are run unconditionally.
+The commands with the `!` suffix ensure that all steps are run
+unconditionally.


 < Articles >__________________________________________________________________~
@@ -366,6 +361,16 @@ The commands with `!` suffix ensure that all steps are run unconditionally.
             {13} http://junegunn.kr/2013/09/thoughts-on-vim-plugin-dependency


+< Collaborators >_____________________________________________________________~
+                                                            *plug-collaborators*
+
+ - {Jan Edmund Lazo}{14} - Windows support
+ - {Jeremy Pallats}{15} - Python installer
+
+                                          {14} https://github.com/janlazo
+                                          {15} https://github.com/starcraftman
+
+
 < License >___________________________________________________________________~
                                                                  *plug-license*

--- a/plug.vim
+++ b/plug.vim
@@ -25,7 +25,7 @@
 "   Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
 "   Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
 "
-"   " Using a non-master branch
+"   " Using a non-default branch
 "   Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
 "
 "   " Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
@@ -99,8 +99,14 @@ let s:mac_gui = has('gui_macvim') && has('gui_running')
 let s:is_win = has('win32')
 let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
 let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
-let s:me = resolve(expand('<sfile>:p'))
-let s:base_spec = { 'branch': 'master', 'frozen': 0 }
+if s:is_win && &shellslash
+  set noshellslash
+  let s:me = resolve(expand('<sfile>:p'))
+  set shellslash
+else
+  let s:me = resolve(expand('<sfile>:p'))
+endif
+let s:base_spec = { 'branch': '', 'frozen': 0 }
 let s:TYPE = {
 \   'string':  type(''),
 \   'list':    type([]),
@@ -110,18 +116,140 @@ let s:TYPE = {
 let s:loaded = get(s:, 'loaded', {})
 let s:triggers = get(s:, 'triggers', {})

+function! s:is_powershell(shell)
+  return a:shell =~# 'powershell\(\.exe\)\?$' || a:shell =~# 'pwsh\(\.exe\)\?$'
+endfunction
+
+function! s:isabsolute(dir) abort
+  return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)')
+endfunction
+
+function! s:git_dir(dir) abort
+  let gitdir = s:trim(a:dir) . '/.git'
+  if isdirectory(gitdir)
+    return gitdir
+  endif
+  if !filereadable(gitdir)
+    return ''
+  endif
+  let gitdir = matchstr(get(readfile(gitdir), 0, ''), '^gitdir: \zs.*')
+  if len(gitdir) && !s:isabsolute(gitdir)
+    let gitdir = a:dir . '/' . gitdir
+  endif
+  return isdirectory(gitdir) ? gitdir : ''
+endfunction
+
+function! s:git_origin_url(dir) abort
+  let gitdir = s:git_dir(a:dir)
+  let config = gitdir . '/config'
+  if empty(gitdir) || !filereadable(config)
+    return ''
+  endif
+  return matchstr(join(readfile(config)), '\[remote "origin"\].\{-}url\s*=\s*\zs\S*\ze')
+endfunction
+
+function! s:git_revision(dir) abort
+  let gitdir = s:git_dir(a:dir)
+  let head = gitdir . '/HEAD'
+  if empty(gitdir) || !filereadable(head)
+    return ''
+  endif
+
+  let line = get(readfile(head), 0, '')
+  let ref = matchstr(line, '^ref: \zs.*')
+  if empty(ref)
+    return line
+  endif
+
+  if filereadable(gitdir . '/' . ref)
+    return get(readfile(gitdir . '/' . ref), 0, '')
+  endif
+
+  if filereadable(gitdir . '/packed-refs')
+    for line in readfile(gitdir . '/packed-refs')
+      if line =~# ' ' . ref
+        return matchstr(line, '^[0-9a-f]*')
+      endif
+    endfor
+  endif
+
+  return ''
+endfunction
+
+function! s:git_local_branch(dir) abort
+  let gitdir = s:git_dir(a:dir)
+  let head = gitdir . '/HEAD'
+  if empty(gitdir) || !filereadable(head)
+    return ''
+  endif
+  let branch = matchstr(get(readfile(head), 0, ''), '^ref: refs/heads/\zs.*')
+  return len(branch) ? branch : 'HEAD'
+endfunction
+
+function! s:git_origin_branch(spec)
+  if len(a:spec.branch)
+    return a:spec.branch
+  endif
+
+  " The file may not be present if this is a local repository
+  let gitdir = s:git_dir(a:spec.dir)
+  let origin_head = gitdir.'/refs/remotes/origin/HEAD'
+  if len(gitdir) && filereadable(origin_head)
+    return matchstr(get(readfile(origin_head), 0, ''),
+                  \ '^ref: refs/remotes/origin/\zs.*')
+  endif
+
+  " The command may not return the name of a branch in detached HEAD state
+  let result = s:lines(s:system('git symbolic-ref --short HEAD', a:spec.dir))
+  return v:shell_error ? '' : result[-1]
+endfunction
+
+if s:is_win
+  function! s:plug_call(fn, ...)
+    let shellslash = &shellslash
+    try
+      set noshellslash
+      return call(a:fn, a:000)
+    finally
+      let &shellslash = shellslash
+    endtry
+  endfunction
+else
+  function! s:plug_call(fn, ...)
+    return call(a:fn, a:000)
+  endfunction
+endif
+
+function! s:plug_getcwd()
+  return s:plug_call('getcwd')
+endfunction
+
+function! s:plug_fnamemodify(fname, mods)
+  return s:plug_call('fnamemodify', a:fname, a:mods)
+endfunction
+
+function! s:plug_expand(fmt)
+  return s:plug_call('expand', a:fmt, 1)
+endfunction
+
+function! s:plug_tempname()
+  return s:plug_call('tempname')
+endfunction
+
 function! plug#begin(...)
  if a:0 > 0
    let s:plug_home_org = a:1
-    let home = s:path(fnamemodify(expand(a:1), ':p'))
+    let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p'))
  elseif exists('g:plug_home')
    let home = s:path(g:plug_home)
+  elseif has('nvim')
+    let home = stdpath('data') . '/plugged'
  elseif !empty(&rtp)
    let home = s:path(split(&rtp, ',')[0]) . '/plugged'
  else
    return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.')
  endif
-  if fnamemodify(home, ':t') ==# 'plugin' && fnamemodify(home, ':h') ==# s:first_rtp
+  if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp
    return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.')
  endif

@@ -139,6 +267,16 @@ function! s:define_commands()
  if !executable('git')
    return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.')
  endif
+  if has('win32')
+  \ && &shellslash
+  \ && (&shell =~# 'cmd\(\.exe\)\?$' || s:is_powershell(&shell))
+    return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.')
+  endif
+  if !has('nvim')
+    \ && (has('win32') || has('win32unix'))
+    \ && !has('multi_byte')
+    return s:err('Vim needs +multi_byte feature on Windows to run shell commands. Enable +iconv for best results.')
+  endif
  command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(<bang>0, [<f-args>])
  command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate  call s:update(<bang>0, [<f-args>])
  command! -nargs=0 -bar -bang PlugClean call s:clean(<bang>0)
@@ -203,7 +341,7 @@ endfunction

 function! plug#end()
  if !exists('g:plugs')
-    return s:err('Call plug#begin() first')
+    return s:err('plug#end() called without calling plug#begin() first')
  endif

  if exists('#PlugLOD')
@@ -269,7 +407,7 @@ function! plug#end()

  for [map, names] in items(lod.map)
    for [mode, map_prefix, key_prefix] in
-          \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
+          \ [['i', '<C-\><C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
      execute printf(
      \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
      \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
@@ -324,7 +462,7 @@ endfunction

 function! s:git_version_requirement(...)
  if !exists('s:git_version')
-    let s:git_version = map(split(split(s:system('git --version'))[2], '\.'), 'str2nr(v:val)')
+    let s:git_version = map(split(split(s:system(['git', '--version']))[2], '\.'), 'str2nr(v:val)')
  endif
  return s:version_requirement(s:git_version, a:000)
 endfunction
@@ -334,11 +472,11 @@ function! s:progress_opt(base)
        \ s:git_version_requirement(1, 7, 1) ? '--progress' : ''
 endfunction

-if s:is_win
-  function! s:rtp(spec)
-    return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
-  endfunction
+function! s:rtp(spec)
+  return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
+endfunction

+if s:is_win
  function! s:path(path)
    return s:trim(substitute(a:path, '/', '\', 'g'))
  endfunction
@@ -350,11 +488,33 @@ if s:is_win
  function! s:is_local_plug(repo)
    return a:repo =~? '^[a-z]:\|^[%~]'
  endfunction
-else
-  function! s:rtp(spec)
-    return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
+
+  " Copied from fzf
+  function! s:wrap_cmds(cmds)
+    let cmds = [
+      \ '@echo off',
+      \ 'setlocal enabledelayedexpansion']
+    \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds])
+    \ + ['endlocal']
+    if has('iconv')
+      if !exists('s:codepage')
+        let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0)
+      endif
+      return map(cmds, printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage))
+    endif
+    return map(cmds, 'v:val."\r"')
  endfunction

+  function! s:batchfile(cmd)
+    let batchfile = s:plug_tempname().'.bat'
+    call writefile(s:wrap_cmds(a:cmd), batchfile)
+    let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0})
+    if s:is_powershell(&shell)
+      let cmd = '& ' . cmd
+    endif
+    return [batchfile, cmd]
+  endfunction
+else
  function! s:path(path)
    return s:trim(a:path)
  endfunction
@@ -434,8 +594,8 @@ endfunction

 function! s:dobufread(names)
  for name in a:names
-    let path = s:rtp(g:plugs[name]).'/**'
-    for dir in ['ftdetect', 'ftplugin']
+    let path = s:rtp(g:plugs[name])
+    for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin']
      if len(finddir(dir, path))
        if exists('#BufRead')
          doautocmd BufRead
@@ -554,7 +714,7 @@ function! plug#(repo, ...)
  try
    let repo = s:trim(a:repo)
    let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec
-    let name = get(opts, 'as', fnamemodify(repo, ':t:s?\.git$??'))
+    let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??'))
    let spec = extend(s:infer_properties(name, repo), opts)
    if !has_key(g:plugs, name)
      call add(g:plugs_order, name)
@@ -562,19 +722,41 @@ function! plug#(repo, ...)
    let g:plugs[name] = spec
    let s:loaded[name] = get(s:loaded, name, 0)
  catch
-    return s:err(v:exception)
+    return s:err(repo . ' ' . v:exception)
  endtry
 endfunction

 function! s:parse_options(arg)
  let opts = copy(s:base_spec)
  let type = type(a:arg)
+  let opt_errfmt = 'Invalid argument for "%s" option of :Plug (expected: %s)'
  if type == s:TYPE.string
+    if empty(a:arg)
+      throw printf(opt_errfmt, 'tag', 'string')
+    endif
    let opts.tag = a:arg
  elseif type == s:TYPE.dict
+    for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as']
+      if has_key(a:arg, opt)
+      \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt]))
+        throw printf(opt_errfmt, opt, 'string')
+      endif
+    endfor
+    for opt in ['on', 'for']
+      if has_key(a:arg, opt)
+      \ && type(a:arg[opt]) != s:TYPE.list
+      \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt]))
+        throw printf(opt_errfmt, opt, 'string or list')
+      endif
+    endfor
+    if has_key(a:arg, 'do')
+      \ && type(a:arg.do) != s:TYPE.funcref
+      \ && (type(a:arg.do) != s:TYPE.string || empty(a:arg.do))
+        throw printf(opt_errfmt, 'do', 'string or funcref')
+    endif
    call extend(opts, a:arg)
    if has_key(opts, 'dir')
-      let opts.dir = s:dirpath(expand(opts.dir))
+      let opts.dir = s:dirpath(s:plug_expand(opts.dir))
    endif
  else
    throw 'Invalid argument type (expected: string or dictionary)'
@@ -585,7 +767,7 @@ endfunction
 function! s:infer_properties(name, repo)
  let repo = a:repo
  if s:is_local_plug(repo)
-    return { 'dir': s:dirpath(expand(repo)) }
+    return { 'dir': s:dirpath(s:plug_expand(repo)) }
  else
    if repo =~ ':'
      let uri = repo
@@ -628,7 +810,7 @@ function! s:syntax()
  syn match plugNumber /[0-9]\+[0-9.]*/ contained
  syn match plugBracket /[[\]]/ contained
  syn match plugX /x/ contained
-  syn match plugDash /^-/
+  syn match plugDash /^-\{1}\ /
  syn match plugPlus /^+/
  syn match plugStar /^*/
  syn match plugMessage /\(^- \)\@<=.*/
@@ -646,6 +828,7 @@ function! s:syntax()
  syn match plugError /^x.*/
  syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/
  syn match plugH2 /^.*:\n-\+$/
+  syn match plugH2 /^-\{2,}/
  syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean
  hi def link plug1       Title
  hi def link plug2       Repeat
@@ -738,7 +921,7 @@ function! s:finish_bindings()
 endfunction

 function! s:prepare(...)
-  if empty(getcwd())
+  if empty(s:plug_getcwd())
    throw 'Invalid current working directory. Cannot proceed.'
  endif

@@ -758,7 +941,7 @@ function! s:prepare(...)
    call s:new_window()
  endif

-  nnoremap <silent> <buffer> q  :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr>
+  nnoremap <silent> <buffer> q :call <SID>close_pane()<cr>
  if a:0 == 0
    call s:finish_bindings()
  endif
@@ -780,6 +963,15 @@ function! s:prepare(...)
  endif
 endfunction

+function! s:close_pane()
+  if b:plug_preview == 1
+    pc
+    let b:plug_preview = -1
+  else
+    bd
+  endif
+endfunction
+
 function! s:assign_name()
  " Assign buffer name
  let prefix = '[Plugins]'
@@ -794,31 +986,35 @@ endfunction

 function! s:chsh(swap)
  let prev = [&shell, &shellcmdflag, &shellredir]
-  if s:is_win
-    set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1
-  elseif a:swap
-    set shell=sh shellredir=>%s\ 2>&1
+  if !s:is_win
+    set shell=sh
+  endif
+  if a:swap
+    if s:is_powershell(&shell)
+      let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s'
+    elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$'
+      set shellredir=>%s\ 2>&1
+    endif
  endif
  return prev
 endfunction

 function! s:bang(cmd, ...)
+  let batchfile = ''
  try
    let [sh, shellcmdflag, shrd] = s:chsh(a:0)
    " FIXME: Escaping is incomplete. We could use shellescape with eval,
    "        but it won't work on Windows.
    let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
    if s:is_win
-      let batchfile = tempname().'.bat'
-      call writefile(["@echo off\r", cmd . "\r"], batchfile)
-      let cmd = batchfile
+      let [batchfile, cmd] = s:batchfile(cmd)
    endif
    let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
    execute "normal! :execute g:_plug_bang\<cr>\<cr>"
  finally
    unlet g:_plug_bang
    let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win
+    if s:is_win && filereadable(batchfile)
      call delete(batchfile)
    endif
  endtry
@@ -831,7 +1027,7 @@ function! s:regress_bar()
 endfunction

 function! s:is_updated(dir)
-  return !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', a:dir))
+  return !empty(s:system_chomp(['git', 'log', '--pretty=format:%h', 'HEAD...HEAD@{1}'], a:dir))
 endfunction

 function! s:do(pull, force, todo)
@@ -868,6 +1064,7 @@ function! s:do(pull, force, todo)
        endif
      elseif type == s:TYPE.funcref
        try
+          call s:load_plugin(spec)
          let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged')
          call spec.do({ 'name': name, 'status': status, 'force': a:force })
        catch
@@ -894,10 +1091,11 @@ endfunction

 function! s:checkout(spec)
  let sha = a:spec.commit
-  let output = s:system('git rev-parse HEAD', a:spec.dir)
-  if !v:shell_error && !s:hash_match(sha, s:lines(output)[0])
+  let output = s:git_revision(a:spec.dir)
+  if !empty(output) && !s:hash_match(sha, s:lines(output)[0])
+    let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : ''
    let output = s:system(
-          \ 'git fetch --depth 999999 && git checkout '.s:esc(sha).' --', a:spec.dir)
+          \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir)
  endif
  return output
 endfunction
@@ -1012,11 +1210,17 @@ function! s:update_impl(pull, force, args) abort
  normal! 2G
  silent! redraw

-  let s:clone_opt = get(g:, 'plug_shallow', 1) ?
-        \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : ''
+  " Set remote name, overriding a possible user git config's clone.defaultRemoteName
+  let s:clone_opt = ['--origin', 'origin']
+  if get(g:, 'plug_shallow', 1)
+    call extend(s:clone_opt, ['--depth', '1'])
+    if s:git_version_requirement(1, 7, 10)
+      call add(s:clone_opt, '--no-single-branch')
+    endif
+  endif

-  if has('win32unix')
-    let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
+  if has('win32unix') || has('wsl')
+    call extend(s:clone_opt, ['-c', 'core.eol=lf', '-c', 'core.autocrlf=input'])
  endif

  let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
@@ -1094,7 +1298,7 @@ function! s:update_finish()
      elseif has_key(spec, 'tag')
        let tag = spec.tag
        if tag =~ '\*'
-          let tags = s:lines(s:system('git tag --list '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir))
+          let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir))
          if !v:shell_error && !empty(tags)
            let tag = tags[0]
            call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
@@ -1102,12 +1306,12 @@ function! s:update_finish()
          endif
        endif
        call s:log4(name, 'Checking out '.tag)
-        let out = s:system('git checkout -q '.s:esc(tag).' -- 2>&1', spec.dir)
+        let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir)
      else
-        let branch = s:esc(get(spec, 'branch', 'master'))
-        call s:log4(name, 'Merging origin/'.branch)
-        let out = s:system('git checkout -q '.branch.' -- 2>&1'
-              \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only origin/'.branch.' 2>&1')), spec.dir)
+        let branch = s:git_origin_branch(spec)
+        call s:log4(name, 'Merging origin/'.s:esc(branch))
+        let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1'
+              \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir)
      endif
      if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
            \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
@@ -1151,7 +1355,7 @@ function! s:job_abort()
      silent! call job_stop(j.jobid)
    endif
    if j.new
-      call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
+      call s:rm_rf(g:plugs[name].dir)
    endif
  endfor
  let s:jobs = {}
@@ -1197,29 +1401,27 @@ function! s:job_cb(fn, job, ch, data)
 endfunction

 function! s:nvim_cb(job_id, data, event) dict abort
-  return a:event == 'stdout' ?
+  return (a:event == 'stdout' || a:event == 'stderr') ?
    \ s:job_cb('s:job_out_cb',  self, 0, join(a:data, "\n")) :
    \ s:job_cb('s:job_exit_cb', self, 0, a:data)
 endfunction

 function! s:spawn(name, cmd, opts)
  let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
-            \ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '',
            \ 'new': get(a:opts, 'new', 0) }
  let s:jobs[a:name] = job
-  let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
-  if !empty(job.batchfile)
-    call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
-    let cmd = job.batchfile
-  endif
-  let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)

  if s:nvim
+    if has_key(a:opts, 'dir')
+      let job.cwd = a:opts.dir
+    endif
+    let argv = a:cmd
    call extend(job, {
    \ 'on_stdout': function('s:nvim_cb'),
+    \ 'on_stderr': function('s:nvim_cb'),
    \ 'on_exit':   function('s:nvim_cb'),
    \ })
-    let jid = jobstart(argv, job)
+    let jid = s:plug_call('jobstart', argv, job)
    if jid > 0
      let job.jobid = jid
    else
@@ -1229,9 +1431,16 @@ function! s:spawn(name, cmd, opts)
            \ 'Invalid arguments (or job table is full)']
    endif
  elseif s:vim8
+    let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"script": 0})'))
+    if has_key(a:opts, 'dir')
+      let cmd = s:with_cd(cmd, a:opts.dir, 0)
+    endif
+    let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd]
    let jid = job_start(s:is_win ? join(argv, ' ') : argv, {
    \ 'out_cb':   function('s:job_cb', ['s:job_out_cb',  job]),
+    \ 'err_cb':   function('s:job_cb', ['s:job_out_cb',  job]),
    \ 'exit_cb':  function('s:job_cb', ['s:job_exit_cb', job]),
+    \ 'err_mode': 'raw',
    \ 'out_mode': 'raw'
    \})
    if job_status(jid) == 'run'
@@ -1242,7 +1451,7 @@ function! s:spawn(name, cmd, opts)
      let job.lines   = ['Failed to start job']
    endif
  else
-    let job.lines = s:lines(call('s:system', [cmd]))
+    let job.lines = s:lines(call('s:system', has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd]))
    let job.error = v:shell_error != 0
    let job.running = 0
  endif
@@ -1262,9 +1471,6 @@ function! s:reap(name)
  call s:log(bullet, a:name, empty(result) ? 'OK' : result)
  call s:bar()

-  if has_key(job, 'batchfile') && !empty(job.batchfile)
-    call delete(job.batchfile)
-  endif
  call remove(s:jobs, a:name)
 endfunction

@@ -1279,9 +1485,10 @@ function! s:bar()
 endfunction

 function! s:logpos(name)
-  for i in range(4, line('$'))
+  let max = line('$')
+  for i in range(4, max > 4 ? max : 4)
    if getline(i) =~# '^[-+x*] '.a:name.':'
-      for j in range(i + 1, line('$'))
+      for j in range(i + 1, max > 5 ? max : 5)
        if getline(j) !~ '^ '
          return [i, j - 1]
        endif
@@ -1341,8 +1548,14 @@ while 1 " Without TCO, Vim stack is bound to explode
    let [error, _] = s:git_validate(spec, 0)
    if empty(error)
      if pull
-        let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : ''
-        call s:spawn(name, printf('git fetch %s %s 2>&1', fetch_opt, prog), { 'dir': spec.dir })
+        let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch']
+        if has_tag && !empty(globpath(spec.dir, '.git/shallow'))
+          call extend(cmd, ['--depth', '99999999'])
+        endif
+        if !empty(prog)
+          call add(cmd, prog)
+        endif
+        call s:spawn(name, cmd, { 'dir': spec.dir })
      else
        let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 }
      endif
@@ -1350,12 +1563,14 @@ while 1 " Without TCO, Vim stack is bound to explode
      let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 }
    endif
  else
-    call s:spawn(name,
-          \ printf('git clone %s %s %s %s 2>&1',
-          \ has_tag ? '' : s:clone_opt,
-          \ prog,
-          \ s:shellesc(spec.uri),
-          \ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
+    let cmd = ['git', 'clone']
+    if !has_tag
+      call extend(cmd, s:clone_opt)
+    endif
+    if !empty(prog)
+      call add(cmd, prog)
+    endif
+    call s:spawn(name, extend(cmd, [spec.uri, s:trim(spec.dir)]), { 'new': 1 })
  endif

  if !s:jobs[name].running
@@ -1392,7 +1607,7 @@ G_NVIM = vim.eval("has('nvim')") == '1'
 G_PULL = vim.eval('s:update.pull') == '1'
 G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1
 G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)'))
-G_CLONE_OPT = vim.eval('s:clone_opt')
+G_CLONE_OPT = ' '.join(vim.eval('s:clone_opt'))
 G_PROGRESS = vim.eval('s:progress_opt(1)')
 G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads'))
 G_STOP = thr.Event()
@@ -1929,7 +2144,7 @@ function! s:update_ruby()
    end
  } if VIM::evaluate('s:mac_gui') == 1

-  clone_opt = VIM::evaluate('s:clone_opt')
+  clone_opt = VIM::evaluate('s:clone_opt').join(' ')
  progress = VIM::evaluate('s:progress_opt(1)')
  nthr.times do
    mtx.synchronize do
@@ -1982,19 +2197,45 @@ function! s:update_ruby()
 EOF
 endfunction

-function! s:shellesc_cmd(arg)
-  let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g')
-  let escaped = substitute(escaped, '%', '%%', 'g')
-  let escaped = substitute(escaped, '"', '\\^&', 'g')
-  let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g')
-  return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"'
+function! s:shellesc_cmd(arg, script)
+  let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g')
+  return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g')
 endfunction

-function! s:shellesc(arg)
-  if &shell =~# 'cmd.exe$'
-    return s:shellesc_cmd(a:arg)
+function! s:shellesc_ps1(arg)
+  return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'"
+endfunction
+
+function! s:shellesc_sh(arg)
+  return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'"
+endfunction
+
+" Escape the shell argument based on the shell.
+" Vim and Neovim's shellescape() are insufficient.
+" 1. shellslash determines whether to use single/double quotes.
+"    Double-quote escaping is fragile for cmd.exe.
+" 2. It does not work for powershell.
+" 3. It does not work for *sh shells if the command is executed
+"    via cmd.exe (ie. cmd.exe /c sh -c command command_args)
+" 4. It does not support batchfile syntax.
+"
+" Accepts an optional dictionary with the following keys:
+" - shell: same as Vim/Neovim 'shell' option.
+"          If unset, fallback to 'cmd.exe' on Windows or 'sh'.
+" - script: If truthy and shell is cmd.exe, escape for batchfile syntax.
+function! plug#shellescape(arg, ...)
+  if a:arg =~# '^[A-Za-z0-9_/:.-]\+$'
+    return a:arg
  endif
-  return shellescape(a:arg)
+  let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {}
+  let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh')
+  let script = get(opts, 'script', 1)
+  if shell =~# 'cmd\(\.exe\)\?$'
+    return s:shellesc_cmd(a:arg, script)
+  elseif s:is_powershell(shell)
+    return s:shellesc_ps1(a:arg)
+  endif
+  return s:shellesc_sh(a:arg)
 endfunction

 function! s:glob_dir(path)
@@ -2026,23 +2267,39 @@ function! s:format_message(bullet, name, message)
  endif
 endfunction

-function! s:with_cd(cmd, dir)
-  return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
+function! s:with_cd(cmd, dir, ...)
+  let script = a:0 > 0 ? a:1 : 1
+  return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd)
 endfunction

 function! s:system(cmd, ...)
+  let batchfile = ''
  try
    let [sh, shellcmdflag, shrd] = s:chsh(1)
-    let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
-    if s:is_win
-      let batchfile = tempname().'.bat'
-      call writefile(["@echo off\r", cmd . "\r"], batchfile)
-      let cmd = batchfile
+    if type(a:cmd) == s:TYPE.list
+      " Neovim's system() supports list argument to bypass the shell
+      " but it cannot set the working directory for the command.
+      " Assume that the command does not rely on the shell.
+      if has('nvim') && a:0 == 0
+        return system(a:cmd)
+      endif
+      let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})'))
+      if s:is_powershell(&shell)
+        let cmd = '& ' . cmd
+      endif
+    else
+      let cmd = a:cmd
    endif
-    return system(s:is_win ? '('.cmd.')' : cmd)
+    if a:0 > 0
+      let cmd = s:with_cd(cmd, a:1, type(a:cmd) != s:TYPE.list)
+    endif
+    if s:is_win && type(a:cmd) != s:TYPE.list
+      let [batchfile, cmd] = s:batchfile(cmd)
+    endif
+    return system(cmd)
  finally
    let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win
+    if s:is_win && filereadable(batchfile)
      call delete(batchfile)
    endif
  endtry
@@ -2056,18 +2313,17 @@ endfunction
 function! s:git_validate(spec, check_branch)
  let err = ''
  if isdirectory(a:spec.dir)
-    let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url', a:spec.dir))
+    let result = [s:git_local_branch(a:spec.dir), s:git_origin_url(a:spec.dir)]
    let remote = result[-1]
-    if v:shell_error
+    if empty(remote)
      let err = join([remote, 'PlugClean required.'], "\n")
    elseif !s:compare_git_uri(remote, a:spec.uri)
      let err = join(['Invalid URI: '.remote,
                    \ 'Expected:    '.a:spec.uri,
                    \ 'PlugClean required.'], "\n")
    elseif a:check_branch && has_key(a:spec, 'commit')
-      let result = s:lines(s:system('git rev-parse HEAD 2>&1', a:spec.dir))
-      let sha = result[-1]
-      if v:shell_error
+      let sha = s:git_revision(a:spec.dir)
+      if empty(sha)
        let err = join(add(result, 'PlugClean required.'), "\n")
      elseif !s:hash_match(sha, a:spec.commit)
        let err = join([printf('Invalid HEAD (expected: %s, actual: %s)',
@@ -2075,8 +2331,9 @@ function! s:git_validate(spec, check_branch)
                      \ 'PlugUpdate required.'], "\n")
      endif
    elseif a:check_branch
-      let branch = result[0]
+      let current_branch = result[0]
      " Check tag
+      let origin_branch = s:git_origin_branch(a:spec)
      if has_key(a:spec, 'tag')
        let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir)
        if a:spec.tag !=# tag && a:spec.tag !~ '\*'
@@ -2084,25 +2341,26 @@ function! s:git_validate(spec, check_branch)
                \ (empty(tag) ? 'N/A' : tag), a:spec.tag)
        endif
      " Check branch
-      elseif a:spec.branch !=# branch
+      elseif origin_branch !=# current_branch
        let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.',
-              \ branch, a:spec.branch)
+              \ current_branch, origin_branch)
      endif
      if empty(err)
-        let [ahead, behind] = split(s:lastline(s:system(printf(
-              \ 'git rev-list --count --left-right HEAD...origin/%s',
-              \ a:spec.branch), a:spec.dir)), '\t')
+        let [ahead, behind] = split(s:lastline(s:system([
+        \ 'git', 'rev-list', '--count', '--left-right',
+        \ printf('HEAD...origin/%s', origin_branch)
+        \ ], a:spec.dir)), '\t')
        if !v:shell_error && ahead
          if behind
            " Only mention PlugClean if diverged, otherwise it's likely to be
            " pushable (and probably not that messed up).
            let err = printf(
                  \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n"
-                  \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', a:spec.branch, ahead, behind)
+                  \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', origin_branch, ahead, behind)
          else
            let err = printf("Ahead of origin/%s by %d commit(s).\n"
                  \ .'Cannot update until local changes are pushed.',
-                  \ a:spec.branch, ahead)
+                  \ origin_branch, ahead)
          endif
        endif
      endif
@@ -2115,7 +2373,9 @@ endfunction

 function! s:rm_rf(dir)
  if isdirectory(a:dir)
-    call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir))
+    return s:system(s:is_win
+    \ ? 'rmdir /S /Q '.plug#shellescape(a:dir)
+    \ : ['rm', '-rf', a:dir])
  endif
 endfunction

@@ -2147,7 +2407,7 @@ function! s:clean(force)

  let allowed = {}
  for dir in dirs
-    let allowed[s:dirpath(fnamemodify(dir, ':h:h'))] = 1
+    let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1
    let allowed[dir] = 1
    for child in s:glob_dir(dir)
      let allowed[child] = 1
@@ -2197,6 +2457,7 @@ endfunction
 function! s:delete(range, force)
  let [l1, l2] = a:range
  let force = a:force
+  let err_count = 0
  while l1 <= l2
    let line = getline(l1)
    if line =~ '^- ' && isdirectory(line[2:])
@@ -2205,11 +2466,22 @@ function! s:delete(range, force)
      let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1)
      let force = force || answer > 1
      if answer
-        call s:rm_rf(line[2:])
+        let err = s:rm_rf(line[2:])
        setlocal modifiable
-        call setline(l1, '~'.line[1:])
-        let s:clean_count += 1
-        call setline(4, printf('Removed %d directories.', s:clean_count))
+        if empty(err)
+          call setline(l1, '~'.line[1:])
+          let s:clean_count += 1
+        else
+          delete _
+          call append(l1 - 1, s:format_message('x', line[1:], err))
+          let l2 += len(s:lines(err))
+          let err_count += 1
+        endif
+        let msg = printf('Removed %d directories.', s:clean_count)
+        if err_count > 0
+          let msg .= printf(' Failed to remove %d directories.', err_count)
+        endif
+        call setline(4, msg)
        setlocal nomodifiable
      endif
    endif
@@ -2220,11 +2492,11 @@ endfunction
 function! s:upgrade()
  echo 'Downloading the latest version of vim-plug'
  redraw
-  let tmp = tempname()
+  let tmp = s:plug_tempname()
  let new = tmp . '/plug.vim'

  try
-    let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp))
+    let out = s:system(['git', 'clone', '--depth', '1', s:plug_src, tmp])
    if v:shell_error
      return s:err('Error upgrading vim-plug: '. out)
    endif
@@ -2365,18 +2637,17 @@ function! s:preview_commit()
    wincmd P
  endif
  setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
+  let batchfile = ''
  try
    let [sh, shellcmdflag, shrd] = s:chsh(1)
-    let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
+    let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
    if s:is_win
-      let batchfile = tempname().'.bat'
-      call writefile(["@echo off\r", cmd . "\r"], batchfile)
-      let cmd = batchfile
+      let [batchfile, cmd] = s:batchfile(cmd)
    endif
    execute 'silent %!' cmd
  finally
    let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win
+    if s:is_win && filereadable(batchfile)
      call delete(batchfile)
    endif
  endtry
@@ -2419,12 +2690,23 @@ function! s:diff()
    endif
    call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
    for [k, v] in plugs
-      let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
-      let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir)
-      if !empty(diff)
-        let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
-        call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
-        let cnts[origin] += 1
+      let branch = s:git_origin_branch(v)
+      if len(branch)
+        let range = origin ? '..origin/'.branch : 'HEAD@{1}..'
+        let cmd = ['git', 'log', '--graph', '--color=never']
+        if s:git_version_requirement(2, 10, 0)
+          call add(cmd, '--no-show-signature')
+        endif
+        call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range])
+        if has_key(v, 'rtp')
+          call extend(cmd, ['--', v.rtp])
+        endif
+        let diff = s:system_chomp(cmd, v.dir)
+        if !empty(diff)
+          let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
+          call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
+          let cnts[origin] += 1
+        endif
      endif
      let bar .= '='
      call s:progress_bar(2, bar, len(total))
@@ -2466,7 +2748,7 @@ function! s:revert()
    return
  endif

-  call s:system('git reset --hard HEAD@{1} && git checkout '.s:esc(g:plugs[name].branch).' --', g:plugs[name].dir)
+  call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir)
  setlocal modifiable
  normal! "_dap
  setlocal nomodifiable
@@ -2486,7 +2768,7 @@ function! s:snapshot(force, ...) abort
  let names = sort(keys(filter(copy(g:plugs),
        \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)')))
  for name in reverse(names)
-    let sha = s:system_chomp('git rev-parse --short HEAD', g:plugs[name].dir)
+    let sha = s:git_revision(g:plugs[name].dir)
    if !empty(sha)
      call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha))
      redraw
@@ -2494,7 +2776,7 @@ function! s:snapshot(force, ...) abort
  endfor

  if a:0 > 0
-    let fn = expand(a:1)
+    let fn = s:plug_expand(a:1)
    if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?'))
      return
    endif
--- a/test/functional.vader
+++ b/test/functional.vader
@@ -0,0 +1,41 @@
+Execute (plug#shellescape() works without optional arguments):
+  if has('unix')
+    AssertEqual "''", plug#shellescape("")
+    AssertEqual "'foo'\\'''", plug#shellescape("foo'")
+  endif
+
+Execute (plug#shellescape() ignores invalid optional argument):
+  if has('unix')
+    AssertEqual "''", plug#shellescape("", '')
+    AssertEqual "'foo'\\'''", plug#shellescape("foo'", [])
+  endif
+
+Execute (plug#shellescape() depends on the shell):
+  AssertEqual "'foo'\\'''", plug#shellescape("foo'", {'shell': 'sh'})
+  AssertEqual '^"foo''^"', plug#shellescape("foo'", {'shell': 'cmd.exe'})
+  AssertEqual "'foo'''", plug#shellescape("foo'", {'shell': 'powershell'})
+  AssertEqual "'foo'''", plug#shellescape("foo'", {'shell': 'powershell.exe'})
+  AssertEqual "'foo'''", plug#shellescape("foo'", {'shell': 'pwsh'})
+
+Execute (plug#shellescape() supports non-trivial cmd.exe escaping):
+  " batchfile
+  AssertEqual '^"^^%%PATH^^%%^"', plug#shellescape("^%PATH^%", {
+  \ 'shell': 'cmd.exe',
+  \ })
+  AssertEqual '^"^^%%PATH^^%%^"', plug#shellescape("^%PATH^%", {
+  \ 'shell': 'cmd.exe',
+  \ 'script': 1,
+  \ })
+  " command prompt
+  AssertEqual '^"^^^%PATH^^^%^"', plug#shellescape("^%PATH^%", {
+  \ 'shell': 'cmd.exe',
+  \ 'script': 0,
+  \ }),
+
+Execute (plug#shellescape() supports non-trivial powershell.exe escaping):
+  AssertEqual '''\"Foo\\''''\\Bar\"''', plug#shellescape('"Foo\''\Bar"', {
+  \ 'shell': 'powershell',
+  \ }),
+  AssertEqual '''\"Foo\\''''\\Bar\"''', plug#shellescape('"Foo\''\Bar"', {
+  \ 'shell': 'powershell.exe',
+  \ }),
--- a/test/run
+++ b/test/run
@@ -91,6 +91,11 @@ DOC
  echo "echomsg 'ftplugin-c'" > "$PLUG_FIXTURES/ftplugin-msg/ftplugin/c.vim"
  echo "echomsg 'ftplugin-java'" > "$PLUG_FIXTURES/ftplugin-msg/ftplugin/java.vim"

+  chmod +w "$PLUG_FIXTURES/cant-delete/autoload" || rm -rf "$PLUG_FIXTURES/cant-delete"
+  mkdir -p "$PLUG_FIXTURES/cant-delete/autoload"
+  touch "$PLUG_FIXTURES/cant-delete/autoload/cant-delete.vim"
+  chmod -w "$PLUG_FIXTURES/cant-delete/autoload"
+
  rm -rf $TEMP/new-branch
  cd $TEMP
  git init new-branch
@@ -122,9 +127,11 @@ git --version
 vim=$(select_vim)
 echo "Selected Vim: $vim"
 if [ "${1:-}" = '!' ]; then
-  $vim -Nu $TEMP/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
-  prepare &&
-  $vim -Nu $TEMP/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
+  FAIL=0
+  $vim -Nu $TEMP/mini-vimrc -c 'Vader! test.vader' > /dev/null || FAIL=1
+  prepare
+  $vim -Nu $TEMP/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null || FAIL=1
+  test $FAIL -eq 0
 else
  $vim -Nu $TEMP/mini-vimrc -c 'Vader test.vader'
 fi
--- a/test/test.vader
+++ b/test/test.vader
@@ -18,10 +18,6 @@ Execute (Initialize test environment):
  \ ['function! ResetPlug()', 'let s:loaded = {}', 'endfunction',
  \  'function! CompareURI(a, b)', 'return s:compare_git_uri(a:a, a:b)', 'endfunction']

-  if $ENV != 'vim8'
-    call add(patch, 'let s:vim8 = 0')
-  endif
-
  call writefile(extend(readfile($PLUG_TMP), patch), $PLUG_TMP)

  set t_Co=256
@@ -90,6 +86,7 @@ Execute (Print Interpreter Version):

 Include: workflow.vader
 Include: regressions.vader
+Include: functional.vader

 Execute (Cleanup):
  silent! call RmRf(g:temp_plugged)
--- a/test/workflow.vader
+++ b/test/workflow.vader
@@ -2,7 +2,7 @@ Execute (plug#end() before plug#begin() should fail):
  redir => out
  silent! AssertEqual 0, plug#end()
  redir END
-  Assert stridx(out, 'Call plug#begin() first') >= 0
+  Assert stridx(out, 'plug#end() called without calling plug#begin() first') >= 0

 Execute (plug#begin() without path argument):
  call plug#begin()
@@ -49,24 +49,32 @@ Execute (Test Plug command):
  AssertEqual 'no-t_co', g:plugs['seoul256.vim'].branch

 ^ Git repo with tag (DEPRECATED. USE TAG OPTION)
+  redir => out
+  silent Plug 'foo/bar.vim', ''
+  redir END
+  Assert out =~ 'Invalid argument for "tag" option of :Plug (expected: string)'
  Plug 'junegunn/goyo.vim', '1.5.2'
  AssertEqual 'file:///tmp/vim-plug-test/junegunn/goyo.vim', g:plugs['goyo.vim'].uri
  AssertEqual join([g:temp_plugged, 'goyo.vim/'], '/'), g:plugs['goyo.vim'].dir
  AssertEqual '1.5.2', g:plugs['goyo.vim'].tag

+  redir => out
+  silent Plug 'foo/bar.vim', {'tag': ''}
+  redir END
+  Assert out =~ 'Invalid argument for "tag" option of :Plug (expected: string)'
  Plug 'junegunn/goyo.vim', { 'tag': '1.5.3' } " Using tag option
  AssertEqual '1.5.3', g:plugs['goyo.vim'].tag

  " Git URI
  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
  AssertEqual 'file:///tmp/vim-plug-test/jg/vim-emoji', g:plugs['vim-emoji'].uri
-  AssertEqual 'master', g:plugs['vim-emoji'].branch
+  AssertEqual '', g:plugs['vim-emoji'].branch
  AssertEqual join([g:temp_plugged, 'vim-emoji/'], '/'), g:plugs['vim-emoji'].dir

  " vim-scripts/
  Plug 'vim-scripts/beauty256'
  AssertEqual 'file:///tmp/vim-plug-test/vim-scripts/beauty256', g:plugs.beauty256.uri
-  AssertEqual 'master', g:plugs.beauty256.branch
+  AssertEqual '', g:plugs.beauty256.branch

  AssertEqual 4, len(g:plugs)

@@ -77,6 +85,26 @@ Execute (Test Plug command):

 Execute (Plug command with dictionary option):
  Log string(g:plugs)
+  for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as']
+    let opts = {}
+    let opts[opt] = ''
+    redir => out
+    silent Plug 'foo/bar.vim', opts
+    redir END
+    Assert out =~ 'Invalid argument for "'.opt.'" option of :Plug (expected: string)'
+  endfor
+  for opt in ['on', 'for']
+    let opts = {}
+    let opts[opt] = ''
+    redir => out
+    silent Plug 'foo/bar.vim', opts
+    redir END
+    Assert out =~ 'Invalid argument for "'.opt.'" option of :Plug (expected: string or list)'
+  endfor
+  redir => out
+  silent Plug 'foo/bar.vim', {'do': ''}
+  redir END
+  Assert out =~ 'Invalid argument for "do" option of :Plug (expected: string or funcref)'
  Plug 'junegunn/seoul256.vim', { 'branch': 'no-t_co', 'rtp': '././' }
  AssertEqual join([g:temp_plugged, 'seoul256.vim/'], '/'), g:plugs['seoul256.vim'].dir
  AssertEqual '././', g:plugs['seoul256.vim'].rtp
@@ -354,6 +382,7 @@ Execute (New commits on remote, PlugUpdate, then PlugDiff):
  " Now we have updates
  normal D
  AssertEqual '2 plugin(s) updated.', getline(1)
+  AssertThrows execute('/gpg')

  " Preview commit
  silent! wincmd P
@@ -399,13 +428,17 @@ Execute (New commits on remote, PlugUpdate, then PlugDiff):
  execute "normal Xy\<cr>"
  AssertExpect '^- ', 1

-  " q will close preview window as well
+  " q will only close preview window
  normal q

  " We no longer have preview window
  silent! wincmd P
  AssertEqual 0, &previewwindow

+  " And we're still on main vim-plug window
+  AssertEqual 'vim-plug', &filetype
+  normal q
+
  " q should not close preview window if it's already open
  pedit
  PlugDiff
@@ -430,6 +463,11 @@ Execute (Test g:plug_pwindow):
  AssertEqual 2, winnr()
  AssertEqual 5, winheight('.')
  wincmd p
+
+  " Close preview window
+  normal q
+
+  " Close main window
  normal q
  unlet g:plug_pwindow

@@ -537,6 +575,51 @@ Execute (PlugDiff):
  Assert !empty(mapcheck("\<cr>"))
  q

+Execute (Do not show diff for commits outside of rtp):
+  call plug#begin()
+  call plug#end()
+  PlugClean!
+
+  call plug#begin()
+  Plug 'file://'.expand('$PLUG_FIXTURES').'/xxx'
+  Plug 'file://'.expand('$PLUG_FIXTURES').'/yyy', { 'rtp': 'rtp' }
+  call plug#end()
+  PlugInstall
+  Log getline(1, '$')
+
+  call system('cd "$PLUG_FIXTURES/xxx" && git commit --allow-empty -m update-xxx && git tag -f xxx')
+  call system('cd "$PLUG_FIXTURES/yyy" && git commit --allow-empty -m update-yyy && git tag -f yyy')
+
+  let g:plugs.yyy.tag = 'yyy'
+  PlugUpdate
+  Log getline(1, '$')
+
+  PlugDiff
+  " 1 plugin(s) updated.
+  " [==]
+  "
+  " Last update:
+  " ------------
+  "
+  " - xxx:
+  "   * 7faa9b2 update-xxx (0 seconds ago)
+  "
+  " Pending updates:
+  " ----------------
+  "
+  " N/A
+  "
+  Log getline(1, '$')
+  AssertEqual 14, line('$')
+  AssertEqual '1 plugin(s) updated.', getline(1)
+  AssertEqual '[==]', getline(2)
+  AssertEqual 'Last update:', getline(4)
+  AssertEqual '- xxx:', getline(7)
+  Assert !empty(mapcheck('o'))
+  Assert !empty(mapcheck('X'))
+  Assert !empty(mapcheck("\<cr>"))
+  q
+
 **********************************************************************
 ~ On-demand loading / Partial installation/update ~
 **********************************************************************
@@ -991,9 +1074,10 @@ Execute (Post-update hook output; success and failure):

 Execute (Post-update hook output; invalid type or funcref):
  call plug#begin()
-  Plug 'junegunn/vim-easy-align', { 'do': 1 }
+  Plug 'junegunn/vim-easy-align', { 'do': ':echo 1' }
  Plug 'junegunn/vim-pseudocl',   { 'do': function('call') }
  call plug#end()
+  let g:plugs['vim-easy-align'].do = 1

  silent PlugInstall! 1
  AssertEqual 'x Post-update hook for vim-pseudocl ... Vim(call):E119: Not enough arguments for function: call', getline(5)
@@ -1397,6 +1481,7 @@ Execute (PlugClean should not try to remove unmanaged plugins inside g:plug_home
  Plug '$PLUG_FIXTURES/fzf'
  Plug '$PLUG_FIXTURES/xxx'
  Plug '$PLUG_FIXTURES/yyy'
+  Plug '$PLUG_FIXTURES/cant-delete'
  call plug#end()

  " Remove z1, z2
@@ -1650,3 +1735,25 @@ Execute (#766 - Allow cloning into an empty directory):
  AssertExpect! '[=]', 1
  q
  unlet d
+
+Execute (#982 - PlugClean should report when directories cannot be removed):
+  call plug#begin('$PLUG_FIXTURES')
+  Plug '$PLUG_FIXTURES/ftplugin-msg', { 'for': [] }
+  Plug '$PLUG_FIXTURES/fzf'
+  Plug '$PLUG_FIXTURES/xxx'
+  Plug '$PLUG_FIXTURES/yyy'
+  call plug#end()
+
+  " Fail to remove cant-delete
+  PlugClean!
+  AssertEqual 'Removed 0 directories. Failed to remove 1 directories.', getline(4)
+  AssertExpect '^x ', 1
+  q
+
+  " Delete tmp but fail to remove cant-delete
+  call mkdir(expand('$PLUG_FIXTURES/tmp'))
+  PlugClean!
+  AssertEqual 'Removed 1 directories. Failed to remove 1 directories.', getline(4)
+  AssertExpect '^x ', 1
+  AssertExpect '^\~ ', 1
+  q
Author	SHA1	Message	Date
Junegunn Choi	e300178a0e	Change the default plugin directory for Neovim And suggest users to call plug#begin() without an argument to avoid confusion.	2022-01-03 23:05:08 +09:00
Shawn Hatori	f085751ca1	README: Clarify recommended plugins directory for Windows Vim (#1151 )	2022-01-03 22:47:53 +09:00
Jaehwang Jerry Jung	68488fd7a3	Fix unexpected cursor movement on on-demand imap loading (#1147 ) `i_CTRL-O` may change the cursor position in an unexpected way. For example, when `autoindent` is set, the user will expect that `i asdf<CR><C-O>` will place the cursor right below `a`. However, `<C-O>` moves the cursor to the first column of line 2. Expected: ``` asdf █ ``` Actual: ``` asdf █ ``` Therefore, it's desirable to use `i_CTRL-\_CTRL-O`, the variant of `i_CTRL-O` that does not move the cursor.	2021-12-06 14:26:19 +09:00
Junegunn Choi	93a115718f	Migrate to GitHub Actions Close #1128 TODO: - Neovim stale/unstable - https://github.com/junegunn/vim-plug/runs/4422576984?check_suite_focus=true#step:3:238 - Vim 7.4 - Ruby parallel installer - Python parallel installer	2021-12-05 23:42:23 +09:00
Gibson Fahnestock	c9971346bb	Set --origin=origin for git clone commands (#1117 ) Otherwise if the user has set a `git config clone.defaultRemoteName foo`, then vim-plug will fail to detect the latest upstream changes as the remote will be incorrect, and will repeatedly state that the plugin repo needs to be cleaned.	2021-08-31 17:14:37 +09:00
Matúš Ferech	66e038d443	Add --create-dirs option to flatpak installation instrictions (#1126 )	2021-08-29 17:20:58 -04:00
Gerald	fc2813ef44	Recognize pwsh(.exe) as PowerShell (#1090 ) Fix #1065	2021-04-30 16:29:04 +09:00
Rosen Stoyanov	cffcfe150b	Add GV.vim-style q mapping (#827 ) * Add GV.vim-style q mapping * Fix test cases Co-authored-by: Junegunn Choi <junegunn.c@gmail.com>	2021-02-08 16:23:21 +09:00
mattn	8b45742540	Disable credential.helper for git fetch (#1046 )	2020-12-14 14:30:44 +09:00
Dylan	5430b6213a	XDG_DATA_HOME respecting powershell script (#1042 ) This version supports Powershell 5.1 (shipped in the latest install of Windows 10)	2020-12-03 22:46:45 +09:00
Junegunn Choi	2f4e28161e	Set empty credential.helper only when git 2.0 or above is available Fix #1031	2020-11-03 22:55:17 +09:00
Subhaditya Nath	ab940f624a	Fix syntax matches (#1028 ) Previously, the highlight of the `------------` line below the `Last Update:` changed from `plugH2` on the whole line to `plugDash` on the first `-` when the cursor moved over it and went below it. This commit updates the `syn match` commands a bit to correct that issue. Close #1027	2020-10-23 00:05:18 +09:00
mattn	c44422460e	Disable credential-helper (#1026 )	2020-10-20 20:48:58 +09:00
Junegunn Choi	d16273e072	Code cleanup	2020-09-08 22:39:56 +09:00
mattn	b17f477585	Reduce the number of git processes for faster operation (#937 ) * Make git operation faster When using many plugins, vim-plug may spawn many git processes for them. * get revision * get branch * get remote.origin.url This is too heavy. especially on Windows. This change get revision, branch, remote origin url directly from .git directory. This idea is borrowed from @k-takata's commit for minpac. Executing external programs is slow especially on Windows. Read the information directly from .git directory. * Copied from devel branch of minpac * Avoid errors * Show errors * Use empty() * Use empty string instead of v:null * Check spec.branch is empty * Use branch * Fix branch and revision * Remove l: and use s:trim * Fix and simplify s:git_get_remote_origin_url * Do not cut off commit hash for correctness Co-authored-by: Junegunn Choi <junegunn.c@gmail.com>	2020-09-08 22:13:21 +09:00
Junegunn Choi	4a3e85e878	Test Neovim on Bionic https://github.com/neovim/neovim/pull/12802	2020-09-08 17:27:20 +09:00
Junegunn Choi	a9bf5bd722	"non-master branch" -> "non-default branch"	2020-08-30 02:05:50 +09:00
Junegunn Choi	e8892a9bef	Update test cases	2020-08-30 02:05:50 +09:00
Junegunn Choi	49be3a8ca9	Use branch name of origin if not specified	2020-08-30 02:05:50 +09:00
Junegunn Choi	95ef5e8d5f	PlugDiff should be able to find pending updates # We need the name of the default branch of origin git checkout some-tag-or-commit git log ..origin/master	2020-08-30 02:05:50 +09:00
Junegunn Choi	6fa6475fee	User-specified branch name should not be empty	2020-08-30 02:05:50 +09:00
Yasuhiro Matsumoto	588467903b	Use branch	2020-08-30 02:05:50 +09:00
Yasuhiro Matsumoto	5706f70f8f	Add missing function	2020-08-30 02:05:50 +09:00
Yasuhiro Matsumoto	4a3c5e7ac2	Support non-master default branch	2020-08-30 02:05:50 +09:00
David Barnett	d53d5a976f	Add \|:Plug\| tag in help docs (#951 )	2020-08-29 10:43:05 +09:00
timm bangma	13ea184015	Update README.md (Powershell Install One-Liner) (#1003 ) A tidy one liner for the powershell install command. Much like the unix one 😄	2020-08-08 18:25:59 -04:00
Raphael Martin Schindler	457bebcd30	Fix typos (#1001 ) Add missing 'the' in some phrases and sentences. Use "Easy", not "Easier", because there are no comparisons in the same sentence or phrase.	2020-08-02 11:52:56 -04:00
Jan Edmund Lazo	b2133cf2ec	Support Windows shell without extension (#997 ) Close https://github.com/junegunn/vim-plug/issues/995 Vim supports omitting file extensions for its option. I omitted the file extension in Neovim's documentation for powershell.	2020-07-20 07:59:29 -04:00
Jan Edmund Lazo	c319036396	Fix #961 tests for Vim 7.4 (#990 ) Use build stages to group related jobs (Vim, Neovim, Vim 7.4). Use "silent" to avoid hit-enter prompt when redirecting output. Always run async and sync tests to debug runtime errors. Vim 7.4.0052 (Ubuntu Trusty) does not allow dynamic keys in inline dictionary. https://docs.travis-ci.com/user/build-stages/	2020-07-06 01:07:42 -04:00
Wolf Honore	3aa3b5a4e8	Report when PlugClean fails to remove a directory (#985 )	2020-06-25 20:56:47 +09:00
Junegunn Choi	01aab60ade	Fix PowerShell instruction for Neovim Close #976	2020-06-08 23:48:55 +09:00
Jan Edmund Lazo	6583b99032	:Plug throws error for invalid option (#961 ) ":Plug" performs a quick type check for most options so that the user can check which plugin has invalid configuration on startup. This does not prevent errors, resulting from modiying "g:plugs" after running "plug#end()". Plugin repo is added to the error message for convenience. Most users should expect no noticeable difference in startup time. Close: #930 Related: #936	2020-06-03 07:34:44 -04:00
Gianluca Recchia	71c41fccf5	Comply with the XDG protocol in the README (#966 )	2020-05-06 19:57:50 +09:00
Stefano	8846bc6af1	Add Flatpak installation instructions to README.md (#846 ) Tested with https://flathub.org/apps/details/io.neovim.nvim	2020-05-05 21:54:46 -04:00
Harshad Srinivasan	0862a76fdd	Updated readme (#967 ) Co-authored-by: Harshad Srinivasan <harshad.srinivasan@lmi3d.com>	2020-05-05 21:28:53 -04:00
Junegunn Choi	54d837fa54	Load plugin before running funcref hook Fix #964 Fix https://github.com/junegunn/fzf.vim/issues/1008	2020-05-03 16:59:22 +09:00
Jan Edmund Lazo	e718868e85	Use list type for command in s:spawn() (#959 ) This allows Neovim to bypass the shell and run git directly. Vim still needs the shell because of how commands are collapsed on Windows and because setting the job's working directory via "cwd" does not work. Refactored s:clone_opt to a list to make this possible.	2020-04-11 10:49:47 -04:00
Jan Edmund Lazo	668bc0fd2a	Support list type command for s:system to reduce batchfiles on Windows (#956 ) * s:system supports list type for command Objective is to reduce batchfiles on Windows. List type gives more flexibility on s:system() on how to pass the shell command to the builtin system(). If system() supports list type for command and there is no working directory, run it directly on system(). Targets Neovim only. Else, convert the list to an escaped command so that the user's shell can execute it. Neovim's system() does not support working directory system() so consider refactoring s:system to use a synchronous job. * Do not escape simple shell arguments Regexp taken from vim-fugitive s:shellesc(). * Set shellredir on Windows Prep to use list type for command passed to s:system() within s:spawn() * Internalize shellredir for s:spawn s:spawn needs to redirect stderr to stdout for jobs callbacks but s:system (for old Vim versions) sets shellredir if needed. * Leverage job api for cwd and stderr Vim/Neovim support stderr redirection and support error callbacks. Vim 8 and Neovim can set a job's working directory via 'cwd' key but it cannot be used as is on Vim because CI fails for the Vim release in Ubuntu Bionic and the latest Vim release.	2020-04-10 15:40:28 -04:00
Henré Botha	c3b6b7c297	Clarify error message (#931 ) The existing error message printed when plug#end() is called without calling plug#begin() doesn't make the dependence on plug#begin() obvious; I had to go digging in the vim-plug code to discover what I'd done wrong. This attempts to clarify the error a bit, to make it more obvious to a user.	2020-01-27 22:48:16 +09:00
Jan Edmund Lazo	2f5f74e5e6	Validate last buffer line of g:plug_window (#927 ) Close #926 This fix shouldn't be necessary because vim-plug's buffer should always have 4 lines but a buffer can be modified in some cases before nvim 0.4.0 and vim v8.1.1360.	2020-01-05 19:59:59 -05:00
Jan Edmund Lazo	b2aa5724c0	Use iconv() only if +iconv is enabled. (#921 ) TODO: Avoid iconv() for commands using ascii only.	2019-12-27 22:35:49 -05:00
Jan Edmund Lazo	359ce90b9b	Encode batchfile in current codepage. (#913 ) Changing chcp breaks cmd.exe if switching from multi-byte to 65001. cmd.exe depends on codepage to parse batchfile so batchfile cannot have unicode characters. Target powershell if unicode support is required. User should fix their terminal font to display unicode characters. Terminal programs can only use Wide String APIs. For Vim, this requires +multi_byte feature and `set encoding=utf-8` in the user's vimrc. Neovim always defaults to `set encoding=utf-8`. https://dev.to/mattn/please-stop-hack-chcp-65001-27db	2019-12-11 08:28:49 -05:00
Jan Edmund Lazo	e6ed2e5658	Do not show git signatures in diff window (#918 ) git v2.10.0 adds "log.showSignature" config so that "git log --show-signature" runs by default. Changing the commit format via "--pretty" does not prevent the signature from appearing. Only "--no-show-signature" prevents this. Close #728	2019-12-09 23:26:56 -05:00
Jan Edmund Lazo	897ce5e2fa	Set/unset shellslash on jobstart (#917 )	2019-12-07 01:05:57 -05:00
Jan Edmund Lazo	d2f8ca2dbc	Detect shellslash on Windows (#916 ) Warn user if shellslash and shell are incompatible. Set/unset shellslash for file functions on Windows. Based on `16fc6862a8/plugin/fzf.vim (L30-L107)` Support shellescape for git-bash Windows user may not set shellslash but wish to use git-bash. This requires custom shellescape for sh,bash shells because builtin shellescape() depends on shellslash. Tested on Vim	2019-12-05 19:34:41 -05:00
Jan Edmund Lazo	93b702512d	Fix shellescaping for git refs and batchfile on Windows (#909 ) It was using s:esc() which escapes spaces with a backslash. This does not work on Windows. &shell could be escaped on because of spaces. See patch-8.0.1455 and related 8.1.x patches that address this for $SHELL on Unix and git-bash on Windows. Related #852, #908 Close #890	2019-12-01 21:01:17 -05:00
Jan Edmund Lazo	68fef9c2fd	Delete batchfile only if it exists (#901 ) Close #900	2019-11-03 21:10:37 -05:00
Daniel Hahler	eee50c55bf	Use s:path with s:rtp always (#694 ) Having a trailing slash with &rtp entries is problematic when removing them later: if loading on demand is used, s:reorg_rtp might fail to remove the previous runtime paths. Test case has been using maktaba (which triggers unsetting s:middle in s:reorg_rtp), but because of the trailing slashes being used, the previous rtp entries were not removed.	2019-10-20 21:52:29 -04:00
Jan Edmund Lazo	96046c01c3	Detect WSL (Neovim only) (#887 ) `has('wsl')` works since Neovim v0.3.0 (`5d2dd2ebe2`) Fix: https://github.com/junegunn/vim-plug/issues/821	2019-10-14 13:38:26 -04:00
Jan Edmund Lazo	fcfd5b7e1f	Use chcp only if sed is in PATH (#891 ) chcp parsing is fragile because of the system locale. There's no convenient way to parse out the codepage value without regex just by relying on cmd.exe builtins and default binaries in PATH. Vim can be used to parse chcp output but it requires an additional `system` per `s:system` and `chcp` can change within the same console so caching the value won't work on the terminal. Powershell supports regex but it has a long startup even with `-NoProfile` so running it when `&shell` is not powershell slows down `:PlugInstall` more.	2019-10-14 07:55:41 -04:00
Jan Edmund Lazo	849b76be90	Fix chcp parsing for the current codepage (#888 ) Relying on delimiters or token positions is fragile. Last value of 'chcp' output is always a number.	2019-10-03 21:19:11 -04:00
Roman Frołow	ff97806e50	Add path for Neovim on Windows (#789 ) Neovim provides `stdpath` to abstract the directory paths that it uses based on the OS. It respects `XDG` specification on Linux and uses `%LOCALAPPDATA%` on Windows. 1. Use `stdpath('data') . '/plugged'` for plugin directory. 2. Use `stdpath('config')` for user-config directory. This is `~/.config/nvim/` on Linux and `%LOCALAPPDATA%\nvim\` on Windows.	2019-09-28 20:30:50 -04:00
gh4w	68b31a4a66	output of chcp was not parsed correctly (#886 ) * output of chcp was not parsed correctly On Windows, when wrapping a batch command with the function s:wrap_cmds(), when calling 'chcp' to get the current code page, the code assumed that the output was in the format "active code page: XXX" (where XXX is the code page), whereas the actual output is localized (for instance, in French, the output would be: "page de code active: XXX"). The parsing of the output relied on that, and this failed for a message different from "active code page" (i.e., English). This patch changes the parsing to split the output of chcp on the colon instead of spaces. Assuming that the output is always in the format "<localized message>: XXX", regardless of the locale, hopefully, this is a bit more robust.	2019-09-28 20:10:13 -04:00
Junegunn Choi	46f843aafe	Add collaborators section	2019-09-03 10:52:29 +09:00
Jan Edmund Lazo	ebd534c88b	Travis: use default image for osx (#871 ) Fix https://travis-ci.org/junegunn/vim-plug/jobs/573145961#L211-L217	2019-08-17 16:51:07 -04:00
Jan Edmund Lazo	3b29e1e6e2	Travis: add macOS 10.14 (#870 )	2019-08-18 00:44:24 +09:00
Jan Edmund Lazo	307b0f244d	travis: add ubuntu bionic,xenial (#867 ) Travis defaults to it since this year. Ubuntu trusty reached EOL since April 2019. Ubuntu bionic provides Vim 8. Simplify OS install with Travis' apt addon so that only Vim nightly will be compiled from source. Ubuntu 14.04.6 provides ruby v.1.9.3, not 1.8.x or older. Use it to test the ruby provider for backward compatibility. Signed-off-by: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>	2019-08-17 12:46:08 +09:00
Jan Edmund Lazo	8a44109329	Fix Windows support for Unix shells and powershell (#860 ) Excerpt from `:h shell-powershell`: To use powershell (on Windows): set shell=powershell shellquote=( shellpipe=\\| shellxquote= set shellcmdflag=-NoLogo\ -NoProfile\ -ExecutionPolicy\ RemoteSigned\ -Command set shellredir=\\|\ Out-File\ -Encoding\ UTF8	2019-08-16 17:55:17 +09:00
Minsoo Kim	0b32d2d23e	Update YCM path: Valloric -> ycm-core (#869 )	2019-08-13 23:15:51 +09:00
Jan Edmund Lazo	226d6abeb2	Don't override shell on Windows (#856 ) Assume that the user set the shell options correctly before running vim-plug so that the user can use bash or powershell as their shell. Close #815	2019-07-16 09:06:27 +09:00
Harry Moreno	fddbcb8f1a	Change PlugClean description (#853 ) Be more clear about uninstalling plugin directories.	2019-07-09 16:16:02 +09:00
Jan Edmund Lazo	f1ad2d864a	Escape batchfile path on Windows (#850 ) Close #832	2019-06-17 23:00:59 +02:00
Junegunn Choi	08e78d8a5e	Avoid downward search when using finddir Close #750	2019-05-29 18:29:11 +09:00
Junegunn Choi	518a3566c3	Escape arguments to git command during PlugUpgrade Fix #832	2019-04-11 17:53:13 +09:00
Daniel Hahler	d1c19a6fa9	Travis: rename vim72 to vim74 (#723 )	2019-02-22 11:14:16 +09:00
Nate Fischer	734d9a11b5	Use 'rtp' option to filter diff (#798 ) Previously, `:PlugDiff` would show every new commit to a plugin's git repo. This makes sense for the general case, but makes less sense when a plugin lives in a subdirectory of the repo (and is configured with the 'rtp' option). This makes it difficult to determine which commits relate to the plugin and which are unrelated. This changes `:PlugDiff` to filter out any commits outside of the 'rtp' folder. Some consequences: * This does not change the `:PlugUpdate` UI. This means `:PlugUpdate` may pull down non-plugin commits, display that it has updated the plugin, and then `:PlugDiff` will show no updates (since such commits fall out of the 'rtp' path). * It also means there's no UI to revert non-plugin updates, as they don't show up in `:PlugDiff`.	2018-11-04 03:00:00 +09:00