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-06 17:14:26 +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
11 changed files with 1960 additions and 419 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,49 +1,69 @@
-language: ruby
-sudo: false
+language: minimal
 env:
  global:
    - DEPS=$HOME/deps
    - PATH=$DEPS/bin:$PATH
-matrix:
+jobs:
  include:
-    - env: ENV=nox
-      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=ruby
-      rvm: 1.8.7
-    - env: ENV=ruby
-      rvm: 2.0.0
+    - 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" == "nox" ]; then
-    mkdir -p ${DEPS}/bin
-    ln -s /usr/bin/vim.nox ${DEPS}/bin/vim
-    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

  git clone --depth 1 https://github.com/vim/vim
  cd vim
+  export PATH=/usr/bin:$PATH
  ./configure $C_OPTS
  make
  make install
--- a/21
+++ b/21
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Junegunn Choi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ 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 `+python`, `+python3`, `+ruby`, or [Neovim][nv])
+  (with any of `+job`, `+python`, `+python3`, `+ruby`, or [Neovim][nv])
 - Creates shallow clones to minimize disk space usage and download time
 - On-demand loading for [faster startup time][startup-time]
 - Can review and rollback updates
@@ -20,13 +20,15 @@ A minimalist Vim plugin manager.

 [40/4]: https://raw.githubusercontent.com/junegunn/i/master/vim-plug/40-in-4.gif
 [nv]: http://neovim.org/
-[startup-time]: http://junegunn.kr/images/vim-startup-time.png
+[startup-time]: https://github.com/junegunn/vim-startuptime-benchmark#result

 ### Installation

 [Download plug.vim](https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim)
 and put it in the "autoload" directory.

+#### Vim
+
 ###### Unix

 ```sh
@@ -34,42 +36,74 @@ curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 ```

-###### Neovim
+You can automate the process by putting the command in your Vim configuration
+file as suggested [here][auto].
+
+[auto]: https://github.com/junegunn/vim-plug/wiki/tips#automatic-installation
+
+###### Windows (PowerShell)
+
+```powershell
+iwr -useb https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim |`
+    ni $HOME/vimfiles/autoload/plug.vim -Force
+```
+
+#### Neovim
+
+###### Unix, Linux

 ```sh
-curl -fLo ~/.config/nvim/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 ~\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 "$(@($env:XDG_DATA_HOME, $env:LOCALAPPDATA)[$null -eq $env:XDG_DATA_HOME])/nvim-data/site/autoload/plug.vim" -Force
 ```

 ### Getting Help

- See the [requirements] page for debugging information & tested configurations.
- See the [FAQ] for common problems and questions.
- Create an [issue](https://github.com/junegunn/vim-plug/issues/new).
+- See [tutorial] page to learn the basics of vim-plug
+- See [tips] and [FAQ] pages for common problems and questions
+- See [requirements] page for debugging information & tested configurations
+- Create an [issue](https://github.com/junegunn/vim-plug/issues/new)

+[tutorial]: https://github.com/junegunn/vim-plug/wiki/tutorial
+[tips]: https://github.com/junegunn/vim-plug/wiki/tips
 [FAQ]: https://github.com/junegunn/vim-plug/wiki/faq
 [requirements]: https://github.com/junegunn/vim-plug/wiki/requirements

 ### 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 `plug#begin()`
+1. Begin the section with `call plug#begin([PLUGIN_DIR])`
 1. List the plugins with `Plug` commands
-1. `plug#end()` to update `&runtimepath` and initialize plugin system
+1. `call plug#end()` to update `&runtimepath` and initialize plugin system
+    - Automatically executes `filetype plugin indent on` and `syntax enable`.
+      You can revert the settings after the call. e.g. `filetype indent off`, `syntax off`, etc.

 #### Example

 ```vim
-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

@@ -79,14 +113,14 @@ Plug 'junegunn/vim-easy-align'
 " Any valid git URL is allowed
 Plug 'https://github.com/junegunn/vim-github-dashboard.git'

-" Group dependencies, vim-snippets depends on ultisnips
+" Multiple Plug commands can be written in a single line using | separators
 Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'

 " On-demand loading
 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)
@@ -101,7 +135,7 @@ Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 " Unmanaged plugin (manually installed and updated)
 Plug '~/my-prototype-plugin'

-" Add plugins to &runtimepath
+" Initialize plugin system
 call plug#end()
 ```

@@ -113,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   |
@@ -141,6 +175,7 @@ Reload .vimrc and `:PlugInstall` to install plugins.
 | `g:plug_retries`    | 2                                 | Number of retries in case of timeout (*Ruby & Python*) |
 | `g:plug_shallow`    | 1                                 | Use shallow clone                                      |
 | `g:plug_window`     | `vertical topleft new`            | Command to open plug window                            |
+| `g:plug_pwindow`    | `above 12new`                     | Command to open preview window in `PlugDiff`           |
 | `g:plug_url_format` | `https://git::@github.com/%s.git` | `printf` format to build repo URL (Only applies to the subsequent `Plug` commands) |


@@ -182,23 +217,29 @@ Plug 'kovisoft/paredit', { 'for': ['clojure', 'scheme'] }
 " On-demand loading on both conditions
 Plug 'junegunn/vader.vim',  { 'on': 'Vader', 'for': 'vader' }

-" Code to execute when the plugin is loaded on demand
-Plug 'Valloric/YouCompleteMe', { 'for': 'cpp' }
-autocmd! User YouCompleteMe if !has('vim_starting') | call youcompleteme#Enable() | endif
+" Code to execute when the plugin is lazily loaded on demand
+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.
+
+```vim
+Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
 ```

 If you need more control, you can pass a reference to a Vim function that
@@ -215,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
@@ -223,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.

@@ -249,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

@@ -258,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
@@ -0,0 +1,381 @@
+plug.txt	plug	Last change: January 3 2022
+PLUG - TABLE OF CONTENTS                                         *plug* *plug-toc*
+==============================================================================
+
+  vim-plug
+    Pros.
+    Installation
+      Vim
+        Unix
+        Windows (PowerShell)
+      Neovim
+        Unix
+        Windows (PowerShell)
+    Getting Help
+    Usage
+      Example
+    Commands
+    Plug options
+    Global options
+    Keybindings
+    Example: A small sensible Vim configuration
+    On-demand loading of plugins
+    Post-update hooks
+    PlugInstall! and PlugUpdate!
+    Articles
+    Collaborators
+    License
+
+VIM-PLUG                                                              *vim-plug*
+==============================================================================
+
+A minimalist Vim plugin manager.
+
+https://raw.githubusercontent.com/junegunn/i/master/vim-plug/installer.gif
+
+
+< Pros. >_____________________________________________________________________~
+                                                                     *plug-pros*
+
+ - 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
+ - On-demand loading for {faster startup time}{3}
+ - Can review and rollback updates
+ - Branch/tag/commit support
+ - Post-update hooks
+ - Support for externally managed plugins
+
+  {1} https://raw.githubusercontent.com/junegunn/i/master/vim-plug/40-in-4.gif
+  {2} http://neovim.org/
+  {3} https://github.com/junegunn/vim-startuptime-benchmark#result
+
+
+< Installation >______________________________________________________________~
+                                                             *plug-installation*
+
+{Download plug.vim}{4} and put it in the "autoload" directory.
+
+       {4} https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+
+
+Vim~
+                                                                      *plug-vim*
+
+
+>> Unix~
+>
+    curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
+        https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+<
+You can automate the process by putting the command in your Vim configuration
+file as suggested {here}{5}.
+
+     {5} https://github.com/junegunn/vim-plug/wiki/tips#automatic-installation
+
+
+>> Windows (PowerShell)~
+>
+    iwr -useb https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim |`
+        ni $HOME/vimfiles/autoload/plug.vim -Force
+<
+
+Neovim~
+                                                                   *plug-neovim*
+
+
+>> Unix~
+>
+    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)~
+>
+    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 >______________________________________________________________~
+                                                             *plug-getting-help*
+
+ - See {tutorial}{6} page to learn the basics of vim-plug
+ - See {tips}{7} and {FAQ}{8} pages for common problems and questions
+ - See {requirements}{9} page for debugging information & tested configurations
+ - Create an {issue}{10}
+
+                    {6} https://github.com/junegunn/vim-plug/wiki/tutorial
+                    {7} https://github.com/junegunn/vim-plug/wiki/tips
+                    {8} https://github.com/junegunn/vim-plug/wiki/faq
+                    {9} https://github.com/junegunn/vim-plug/wiki/requirements
+                    {10} https://github.com/junegunn/vim-plug/issues/new
+
+
+< Usage >_____________________________________________________________________~
+                                                                    *plug-usage*
+
+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([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`.
+     You can revert the settings after the call. e.g. `filetype indent off`,
+     `syntax off`, etc.
+
+
+Example~
+                                                                  *plug-example*
+>
+    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
+
+    " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align
+    Plug 'junegunn/vim-easy-align'
+
+    " Any valid git URL is allowed
+    Plug 'https://github.com/junegunn/vim-github-dashboard.git'
+
+    " Multiple Plug commands can be written in a single line using | separators
+    Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
+
+    " On-demand loading
+    Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
+    Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
+
+    " Using a non-default branch
+    Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
+
+    " Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
+    Plug 'fatih/vim-go', { 'tag': '*' }
+
+    " Plugin options
+    Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
+
+    " Plugin outside ~/.vim/plugged with post-update hook
+    Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+
+    " Unmanaged plugin (manually installed and updated)
+    Plug '~/my-prototype-plugin'
+
+    " Initialize plugin system
+    call plug#end()
+<
+                                                                  *:PlugInstall*
+
+Reload .vimrc and `:PlugInstall` to install plugins.
+
+
+< Commands >__________________________________________________________________~
+                                                                 *plug-commands*
+
+ ------------------------------------+-------------------------------------------------------------------
+ Command                             | Description                                                       ~
+ ------------------------------------+-------------------------------------------------------------------
+  `PlugInstall [name ...] [#threads]`  | Install plugins
+  `PlugUpdate [name ...] [#threads]`   | Install or update plugins
+  `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
+  `PlugSnapshot[!] [output path]`      | Generate script for restoring the current snapshot of the plugins
+ ------------------------------------+-------------------------------------------------------------------
+
+
+< Plug options >______________________________________________________________~
+                                                                  *plug-options*
+                                                                         *:Plug*
+
+ ------------------------+-----------------------------------------------
+ Option                  | Description                                   ~
+ ------------------------+-----------------------------------------------
+  `branch` / `tag` / `commit`  | Branch/tag/commit of the repository to use
+  `rtp`                    | Subdirectory that contains Vim plugin
+  `dir`                    | Custom directory for the plugin
+  `as`                     | Use different name for the plugin
+  `do`                     | Post-update hook (string or funcref)
+  `on`                     | On-demand loading: Commands or <Plug>-mappings
+  `for`                    | On-demand loading: File types
+  `frozen`                 | Do not update unless explicitly specified
+ ------------------------+-----------------------------------------------
+
+
+< Global options >____________________________________________________________~
+                                                           *plug-global-options*
+
+     *g:plug_threads* *g:plug_timeout* *g:plug_retries* *g:plug_shallow* *g:plug_window*
+                                              *g:plug_pwindow* *g:plug_url_format*
+
+ --------------------+-----------------------------------+-----------------------------------------------------------------------------------
+ Flag                | Default                           | Description                                                                       ~
+ --------------------+-----------------------------------+-----------------------------------------------------------------------------------
+  `g:plug_threads`     | 16                                | Default number of threads to use
+  `g:plug_timeout`     | 60                                | Time limit of each task in seconds (Ruby & Python)
+  `g:plug_retries`     | 2                                 | Number of retries in case of timeout (Ruby & Python)
+  `g:plug_shallow`     | 1                                 | Use shallow clone
+  `g:plug_window`      |  `vertical topleft new`             | Command to open plug window
+  `g:plug_pwindow`     |  `above 12new`                      | Command to open preview window in  `PlugDiff`
+  `g:plug_url_format`  |  `https://git::@github.com/%s.git`  |  `printf`  format to build repo URL (Only applies to the subsequent  `Plug`  commands)
+ --------------------+-----------------------------------+-----------------------------------------------------------------------------------
+
+
+< Keybindings >_______________________________________________________________~
+                                                              *plug-keybindings*
+
+                                                         *:PlugStatus* *:PlugDiff*
+
+ - `D` - `PlugDiff`
+ - `S` - `PlugStatus`
+ - `R` - Retry failed update or installation tasks
+ - `U` - Update plugins in the selected range
+ - `q` - Close the window
+ - `:PlugStatus`
+   - `L` - Load plugin
+ - `:PlugDiff`
+   - `X` - Revert the update
+
+
+< Example: A small sensible Vim configuration >_______________________________~
+                               *plug-example-a-small-sensible-vim-configuration*
+>
+    call plug#begin()
+    Plug 'tpope/vim-sensible'
+    call plug#end()
+<
+
+< On-demand loading of plugins >______________________________________________~
+                                             *plug-on-demand-loading-of-plugins*
+>
+    " NERD tree will be loaded on the first invocation of NERDTreeToggle command
+    Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
+
+    " Multiple commands
+    Plug 'junegunn/vim-github-dashboard', { 'on': ['GHDashboard', 'GHActivity'] }
+
+    " Loaded when clojure file is opened
+    Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
+
+    " Multiple file types
+    Plug 'kovisoft/paredit', { 'for': ['clojure', 'scheme'] }
+
+    " On-demand loading on both conditions
+    Plug 'junegunn/vader.vim',  { 'on': 'Vader', 'for': 'vader' }
+
+    " Code to execute when the plugin is lazily loaded on demand
+    Plug 'junegunn/goyo.vim', { 'for': 'markdown' }
+    autocmd! User goyo.vim echom 'Goyo is now loaded!'
+<
+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 the `do` option to describe the task to be performed.
+>
+    Plug 'Shougo/vimproc.vim', { 'do': 'make' }
+    Plug 'ycm-core/YouCompleteMe', { 'do': './install.py' }
+<
+If the value starts with `:`, it will be recognized as a Vim command.
+
+                                                            *:GoInstallBinaries*
+>
+    Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
+<
+If you need more control, you can pass a reference to a Vim function that
+takes a single argument.
+>
+    function! BuildYCM(info)
+      " info is a dictionary with 3 fields
+      " - name:   name of the plugin
+      " - status: 'installed', 'updated', or 'unchanged'
+      " - force:  set on PlugInstall! or PlugUpdate!
+      if a:info.status == 'installed' || a:info.force
+        !./install.py
+      endif
+    endfunction
+
+    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 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' }
+<
+But you can avoid the escaping if you extract the inline specification using a
+variable (or any Vimscript expression) as follows:
+
+                                                                 *g:fzf_install*
+>
+    let g:fzf_install = 'yes | ./install'
+    Plug 'junegunn/fzf', { 'do': g:fzf_install }
+<
+
+< PlugInstall! and PlugUpdate! >______________________________________________~
+                                                    *pluginstall-and-plugupdate*
+
+The installer takes the following steps when installing/updating a plugin:
+
+ 1. `git clone` or `git fetch` from its origin
+ 2. Check out branch, tag, or commit and optionally `git merge` remote branch
+ 3. If the plugin was updated (or installed for the first time)
+   1. Update submodules
+   2. Execute post-update hooks
+
+The commands with the `!` suffix ensure that all steps are run
+unconditionally.
+
+
+< Articles >__________________________________________________________________~
+                                                                 *plug-articles*
+
+ - {Writing my own Vim plugin manager}{11}
+ - {Vim plugins and startup time}{12}
+ - ~~{Thoughts on Vim plugin dependency}{13}~~
+   - Support for Plugfile has been removed since 0.5.0
+
+             {11} http://junegunn.kr/2013/09/writing-my-own-vim-plugin-manager
+             {12} http://junegunn.kr/2014/07/vim-plugins-and-startup-time
+             {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*
+
+MIT
+
+
+==============================================================================
+vim:tw=78:sw=2:ts=2:ft=help:norl:nowrap:
--- a/plug.vim
+++ b/plug.vim
--- 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/regressions.vader
+++ b/test/regressions.vader
@@ -1,5 +1,6 @@
 **********************************************************************
 Execute (#112 On-demand loading should not suppress messages from ftplugin):
+  call ResetPlug()
  call plug#begin('$PLUG_FIXTURES')
  Plug '$PLUG_FIXTURES/ftplugin-msg', { 'for': 'c' }
  call plug#end()
@@ -7,19 +8,20 @@ Execute (#112 On-demand loading should not suppress messages from ftplugin):
  redir => out
  tabnew a.c
  redir END
-  Assert stridx(out, 'ftplugin') >= 0
+  Assert stridx(out, 'ftplugin-c') >= 0, 'Unexpected output (1): '.out

 * The same applies to plug#load())
+  call ResetPlug()
  redir => out
  call plug#load('ftplugin-msg')
  redir END
-  Assert stridx(out, 'ftplugin') >= 0
+  Assert stridx(out, 'ftplugin-c') >= 0, 'Unexpected output (2): '.out
  q


 **********************************************************************
 Execute (#114 Should not contain empty path in &rtp):
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  call plug#end()

  Log &rtp
@@ -35,10 +37,11 @@ Execute (#130 Proper cleanup of on-demand loading triggers):

  " Cleared on command
  call ReloadPlug()
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  Plug 'junegunn/vim-emoji', { 'on':  ['EmojiCommand', 'EmojiCommand2', '<Plug>(EmojiMapping)'] }
  call plug#end()
  PlugInstall | q
+  call mkdir(g:plugs['vim-emoji'].dir.'/after/plugin', 'p')

  Assert exists(':EmojiCommand'), 'EmojiCommand not defined'
  Assert exists(':EmojiCommand2'), 'EmojiCommand2 not defined'
@@ -52,7 +55,7 @@ Execute (#130 Proper cleanup of on-demand loading triggers):

  " Cleared on FileType
  call ReloadPlug()
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  Plug 'junegunn/vim-emoji', { 'on': ['EmojiCommandExtra', '<Plug>(EmojiMappingExtra)'], 'for': ['emoji'] }
  call plug#end()

@@ -78,31 +81,32 @@ Execute (#131 Syntax error):
 **********************************************************************
 Execute (#139-1 Using new remote branch):
  " Make sure to remove the clone
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  call plug#end()
  PlugClean!

  " Install master branch
-  call plug#begin('/tmp/plugged')
-  Plug expand('file:////tmp/new-branch')
+  call plug#begin('/tmp/vim-plug-test/plugged')
+  Plug expand('file:////tmp/vim-plug-test/new-branch')
  call plug#end()
  PlugUpdate

  unlet! g:foo g:bar g:baz
+  call ResetPlug()
  call plug#load('new-branch')
-  Assert exists('g:foo'),  'g:foo should be found'
-  Assert !exists('g:bar'), 'g:bar should not be found'
-  Assert !exists('g:baz'), 'g:baz should not be found'
+  Assert exists('g:foo'),  'g:foo should be found (1)'
+  Assert !exists('g:bar'), 'g:bar should not be found (1)'
+  Assert !exists('g:baz'), 'g:baz should not be found (1)'

  " Create a new branch on origin
-  call system('cd /tmp/new-branch && git checkout -b new &&'
+  call system('cd /tmp/vim-plug-test/new-branch && git checkout -b new &&'
      \. 'echo "let g:bar = 1" > plugin/bar.vim && git add plugin/bar.vim &&'
      \. 'git commit -m second')

  " We're setting up two plugins so that parallel installer is used
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  Plug 'junegunn/seoul256.vim'
-  Plug expand('file:////tmp/new-branch'), { 'branch': 'new' }
+  Plug expand('file:////tmp/vim-plug-test/new-branch'), { 'branch': 'new' }
  call plug#end()
  PlugUpdate
  silent %y
@@ -110,10 +114,11 @@ Execute (#139-1 Using new remote branch):
  Assert @" !~? 'error', 'Should be able to use new remote branch: ' . @"

  unlet! g:foo g:bar g:baz
+  call ResetPlug()
  call plug#load('new-branch')
-  Assert exists('g:foo'),  'g:foo should be found'
-  Assert exists('g:bar'),  'g:bar should be found'
-  Assert !exists('g:baz'), 'g:baz should not be found'
+  Assert exists('g:foo'),  'g:foo should be found (2)'
+  Assert exists('g:bar'),  'g:bar should be found (2)'
+  Assert !exists('g:baz'), 'g:baz should not be found (2)'

  call PlugStatusSorted()

@@ -125,14 +130,14 @@ Expect:

 Execute (#139-2 Using yet another new remote branch):
  " Create another branch on origin
-  call system('cd /tmp/new-branch && git checkout master &&'
+  call system('cd /tmp/vim-plug-test/new-branch && git checkout master &&'
      \. 'git checkout -b brand-new &&'
      \. 'echo "let g:baz = 1" > plugin/baz.vim && git add plugin/baz.vim &&'
      \. 'git commit -m third')

  " Test Vim installer here
-  call plug#begin('/tmp/plugged')
-  Plug expand('file:////tmp/new-branch'), { 'branch': 'brand-new' }
+  call plug#begin('/tmp/vim-plug-test/plugged')
+  Plug expand('file:////tmp/vim-plug-test/new-branch'), { 'branch': 'brand-new' }
  call plug#end()
  PlugUpdate
  silent %y
@@ -140,6 +145,7 @@ Execute (#139-2 Using yet another new remote branch):
  Assert @" !~? 'error', 'Should be able to use new remote branch: ' . @"

  unlet! g:foo g:bar g:baz
+  call ResetPlug()
  call plug#load('new-branch')
  Assert exists('g:foo'),  'g:foo should be found'
  Assert !exists('g:bar'), 'g:bar should not be found'
@@ -154,19 +160,19 @@ Expect:

 Execute (#139-3 Should fail when not possible to fast-forward):
  " Commit on cloned repo
-  call system('cd /tmp/plugged/new-branch && git checkout master &&'
+  call system('cd /tmp/vim-plug-test/plugged/new-branch && git checkout master &&'
      \. 'touch foobar && git add foobar && git commit -m foobar')

  " Different commit on remote
-  call system('cd /tmp/new-branch && git checkout master &&'
+  call system('cd /tmp/vim-plug-test/new-branch && git checkout master &&'
      \. 'touch foobaz && git add foobaz && git commit -m foobaz')

  for multi in [0, 1]
-    call plug#begin('/tmp/plugged')
+    call plug#begin('/tmp/vim-plug-test/plugged')
    if multi
      Plug 'junegunn/seoul256.vim'
    endif
-    Plug expand('file:////tmp/new-branch')
+    Plug expand('file:////tmp/vim-plug-test/new-branch')
    call plug#end()
    PlugUpdate
    silent %y
@@ -210,7 +216,7 @@ Execute (#159: shell=/bin/tcsh):
  let org = &shell
  try
    set shell=/bin/tcsh
-    call plug#begin('/tmp/plugged')
+    call plug#begin('/tmp/vim-plug-test/plugged')
    Plug 'junegunn/seoul256.vim'
    call plug#end()

@@ -224,21 +230,21 @@ Execute (#159: shell=/bin/tcsh):

 **********************************************************************
 Execute (#154: Spaces in &rtp should not be escaped):
-  call plug#begin('/tmp/plug it')
-  Plug 'seoul256 vim'
+  call plug#begin('/tmp/vim-plug-test/plug it')
+  Plug 'foo/seoul256 vim'
  call plug#end()
  Log &rtp
  Assert stridx(&rtp, 'plug it/seoul256 vim') >= 0

 **********************************************************************
 Execute (#184: Duplicate entries in &rtp):
-  call plug#begin('/tmp/plugged')
-  Plug 'plugin1'
-    \| Plug 'plugin0'
+  call plug#begin('/tmp/vim-plug-test/plugged')
+  Plug 'foo/plugin1'
+    \| Plug 'foo/plugin0'

-  Plug 'plugin2'
-    \| Plug 'plugin0'
-    \| Plug 'plugin1'
+  Plug 'foo/plugin2'
+    \| Plug 'foo/plugin0'
+    \| Plug 'foo/plugin1'
  call plug#end()

  Log &rtp
@@ -250,7 +256,7 @@ Execute (#236: Plugin removed from &rtp when .vimrc is reloaded):
  silent! delc EasyAlign

  call ReloadPlug()
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' }
  call plug#end()
  PlugInstall | q
@@ -259,19 +265,19 @@ Execute (#236: Plugin removed from &rtp when .vimrc is reloaded):
  %EasyAlign=
  Assert &rtp =~ '/vim-easy-align', 'Plugin should be in &rtp'

-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' }
  call plug#end()
  Assert &rtp =~ '/vim-easy-align', 'Plugin should still be in &rtp'

 **********************************************************************
 Execute (#350: Ruby installer failed to unshallow tagged plugin on update):
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  call plug#end()
  PlugClean!

  " Shallow clone. We should have at least 2 plugins to enable parallel installer.
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  Plug 'junegunn/vim-easy-align'
  Plug 'junegunn/seoul256.vim'
  call plug#end()
@@ -279,7 +285,7 @@ Execute (#350: Ruby installer failed to unshallow tagged plugin on update):
  Assert filereadable(g:plugs['vim-easy-align'].dir.'/.git/shallow')

  " Now unshallowed
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  Plug 'junegunn/vim-easy-align', { 'tag': '2.9.0' }
  Plug 'junegunn/seoul256.vim'
  call plug#end()
@@ -289,16 +295,81 @@ Execute (#350: Ruby installer failed to unshallow tagged plugin on update):

 **********************************************************************
 Execute (#474: Load ftdetect files in filetypedetect augroup):
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
  Plug 'junegunn/rust.vim', { 'for': 'rust', 'commit': '115d321d383eb96d438466c56cc871fcc1bd0faa' }
  call plug#end()
  PlugInstall!
  q

-  tabnew /tmp/any.rs
+  tabnew /tmp/vim-plug-test/any.rs
  AssertEqual 'rust', &filetype
  Log &filetype
  filetype detect
  AssertEqual 'rust', &filetype
  Log &filetype
  bd
+
+**********************************************************************
+Execute (#489/#587 On-demand loading with 'on' option should trigger BufRead autocmd w/o nomodeline):
+  call plug#begin('$PLUG_FIXTURES')
+  Plug 'foo/ftplugin-msg', { 'on': 'XXX' }
+  call plug#end()
+
+  tabnew a.java
+  call setline(1, '// vim: set filetype=lava:')
+  redir => out
+  silent! XXX
+  redir END
+  Assert stridx(out, 'ftplugin-java') >= 0
+  AssertEqual 'lava', &filetype
+  q!
+
+**********************************************************************
+Execute (Cursor moved to another window during post-update hook):
+  function! DoSplit(...)
+    new
+    call setline(1, 'empty')
+  endfunction
+  call plug#begin('/tmp/vim-plug-test/plugged')
+  Plug 'junegunn/rust.vim', { 'do': function('DoSplit') }
+  call plug#end()
+  PlugInstall!
+  AssertEqual 1, line('$')
+  AssertEqual 'empty', getline(1)
+  q!
+  q
+
+**********************************************************************
+Execute (#593 Add plugin to &rtp before running post-update hook with : prefix):
+  call ReloadPlug()
+  call plug#begin()
+  Plug 'junegunn/vim-pseudocl', { 'on': 'XXX', 'do': ':let g:bar = pseudocl#complete#extract_words(''a b'')' }
+  call plug#end()
+  PlugInstall!
+  AssertEqual ['a', 'b'], g:bar
+
+**********************************************************************
+Execute (#602 Confusion with branch name and path name):
+  call plug#begin()
+  Plug expand('file:////tmp/vim-plug-test/new-branch'), { 'branch': 'plugin' }
+  call plug#end()
+  PlugUpdate
+  call PlugStatusSorted()
+
+Expect:
+  - new-branch: OK
+  Finished. 0 error(s).
+  [=]
+
+**********************************************************************
+Execute (PlugStatus showed error with wildcard tag):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'tag': '*' }
+  call plug#end()
+  PlugUpdate
+  call PlugStatusSorted()
+
+Expect:
+  - vim-easy-align: OK
+  Finished. 0 error(s).
+  [=]
--- a/test/run
+++ b/test/run
@@ -1,25 +1,32 @@
 #!/bin/bash

-cd $(dirname "${BASH_SOURCE[0]}")
+# Privileged mode, ignores $CDPATH etc.
+set -p
+set -eu
+
+cd "$(dirname "${BASH_SOURCE[0]}")"

 export BASE="$PWD"
 export PLUG_SRC="$PWD/../plug.vim"
 export PLUG_FIXTURES="$PWD/fixtures"
 mkdir -p "$PLUG_FIXTURES"
+export TEMP=/tmp/vim-plug-test
+rm -rf "$TEMP"
+mkdir -p "$TEMP"

-cat > /tmp/mini-vimrc << VIMRC
-set rtp+=/tmp/junegunn/vader.vim
+cat > $TEMP/mini-vimrc << VIMRC
+set rtp+=$TEMP/junegunn/vader.vim
 set shell=/bin/bash
 VIMRC

 clone() {
-  if [ ! -d $2 ]; then
-    git clone $1 $2
+  if [ ! -d "$2" ]; then
+    git clone "$1" "$2"
  fi
 }

 clone_repos() (
-  cd /tmp
+  cd $TEMP
  mkdir -p junegunn vim-scripts jg
  for repo in vader.vim goyo.vim rust.vim seoul256.vim vim-easy-align vim-fnr \
              vim-oblique vim-pseudocl vim-redis vim-emoji; do
@@ -41,8 +48,8 @@ make_dirs() (
  cd "$PLUG_FIXTURES/$1"
  mkdir -p autoload colors ftdetect ftplugin indent plugin syntax
  for d in *; do
-    [ -d $d ] || continue
-    cat > $d/xxx.vim << EOF
+    [ -d "$d" ] || continue
+    cat > "$d/xxx.vim" << EOF
    " echom expand('<sfile>')
    let g:total_order = get(g:, 'total_order', [])
    let g:$2 = get(g:, '$2', [])
@@ -70,30 +77,42 @@ DOC

  make_dirs yyy/ yyy
  make_dirs yyy/after yyy
+  mkdir -p "$PLUG_FIXTURES/yyy/rtp/doc"
+  cat > "$PLUG_FIXTURES/yyy/rtp/doc/yyy.txt" << DOC
+hello *yyy*
+DOC
  gitinit yyy

  make_dirs z1/ z1
  make_dirs z2/ z2

  rm -rf "$PLUG_FIXTURES/ftplugin-msg"
-  mkdir -p "$PLUG_FIXTURES/ftplugin-msg/ftplugin"
-  echo "echomsg 'ftplugin'" > "$PLUG_FIXTURES/ftplugin-msg/ftplugin/c.vim"
+  mkdir -p "$PLUG_FIXTURES"/ftplugin-msg/{plugin,ftplugin}
+  echo "echomsg 'ftplugin-c'" > "$PLUG_FIXTURES/ftplugin-msg/ftplugin/c.vim"
+  echo "echomsg 'ftplugin-java'" > "$PLUG_FIXTURES/ftplugin-msg/ftplugin/java.vim"

-  rm -rf /tmp/new-branch
-  cd /tmp
+  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
  cd new-branch
  mkdir plugin
  echo 'let g:foo = 1' > plugin/foo.vim
  git add plugin/foo.vim
  git commit -m initial
+  git checkout -b plugin
+  git checkout master

  cd "$BASE"
 }

 select_vim() {
  local vim=/usr/bin/vim
-  if [ -n "$DEPS" ] && [ -e "${DEPS}/bin/vim" ]; then
+  if [ -n "${DEPS:-}" ] && [ -e "${DEPS}/bin/vim" ]; then
    vim="${DEPS}/bin/vim"
  elif [ -e "/usr/local/bin/vim" ]; then
    vim=/usr/local/bin/vim
@@ -105,13 +124,14 @@ clone_repos
 prepare

 git --version
-VIM=$(select_vim)
-echo "Selected Vim: $VIM"
-if [ "$1" = '!' ]; then
-  $VIM -Nu /tmp/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
-  prepare &&
-  $VIM -Nu /tmp/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
+vim=$(select_vim)
+echo "Selected Vim: $vim"
+if [ "${1:-}" = '!' ]; then
+  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 /tmp/mini-vimrc -c 'Vader test.vader'
+  $vim -Nu $TEMP/mini-vimrc -c 'Vader test.vader'
 fi
-
--- a/test/test.vader
+++ b/test/test.vader
@@ -2,7 +2,7 @@ Execute (Initialize test environment):
  Save &rtp, g:plugs, g:plug_home, g:plug_window
  unlet! g:plugs g:plug_home g:plug_window

-  let g:plug_url_format = 'file:///tmp/%s'
+  let g:plug_url_format = 'file:///tmp/vim-plug-test/%s'
  let g:base_rtp        = &rtp
  let g:first_rtp       = split(&rtp, ',')[0]
  let g:last_rtp        = split(&rtp, ',')[-1]
@@ -14,8 +14,11 @@ Execute (Initialize test environment):

  " Temporarily patch plug.vim
  call system('cp "$PLUG_SRC" "$PLUG_TMP"')
-  call writefile(extend(readfile($PLUG_TMP),
-  \ ['function! ResetPlug()', 'let s:loaded = {}', 'endfunction']), $PLUG_TMP)
+  let patch =
+  \ ['function! ResetPlug()', 'let s:loaded = {}', 'endfunction',
+  \  'function! CompareURI(a, b)', 'return s:compare_git_uri(a:a, a:b)', 'endfunction']
+
+  call writefile(extend(readfile($PLUG_TMP), patch), $PLUG_TMP)

  set t_Co=256
  colo default
@@ -30,9 +33,10 @@ Execute (Initialize test environment):
    g/^$/d
  endfunction

-  function! AssertExpect(bang, pat, cnt)
+  function! AssertExpect(bang, pat, cnt, ...)
    let op = a:bang ? '==#' : '=~#'
-    AssertEqual a:cnt, len(filter(getline(1, '$'), "v:val ".op." '".a:pat."'"))
+    let args = [a:cnt, len(filter(getline(1, '$'), "v:val ".op." '".a:pat."'"))] + a:000
+    call call('vader#assert#equal', args)
  endfunction
  command! -nargs=+ -bang AssertExpect call AssertExpect('<bang>' == '!', <args>)

@@ -69,17 +73,20 @@ Execute (Initialize test environment):
 Execute (Print Interpreter Version):
  redir => out
  if has('ruby')
-    silent ruby puts 'Ruby: ' + RUBY_VERSION
-  elseif has('python')
-    silent python import sys; svi = sys.version_info; print 'Python: {}.{}.{}'.format(svi[0], svi[1], svi[2])
-  elseif has('python3')
-    silent python3 import sys; svi = sys.version_info; print('Python: {}.{}.{}'.format(svi[0], svi[1], svi[2]))
+    silent! ruby puts 'Ruby: ' + RUBY_VERSION
+  endif
+  if has('python')
+    silent! python import sys; svi = sys.version_info; print 'Python: {}.{}.{}'.format(svi[0], svi[1], svi[2])
+  endif
+  if has('python3')
+    silent! python3 import sys; svi = sys.version_info; print('Python: {}.{}.{}'.format(svi[0], svi[1], svi[2]))
  endif
  redir END
-  Log substitute(out, '\n', '', 'g')
+  Log split(out, '\n')

 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()
@@ -19,6 +19,13 @@ Execute (plug#begin() without path argument with empty &rtp):
  let &rtp = save_rtp
  unlet save_rtp

+Execute (Standard runtime path is not allowed):
+  redir => out
+  silent! AssertEqual 0, plug#begin(split(&rtp, ',')[0].'/plugin')
+  redir END
+  Log out
+  Assert stridx(out, 'Invalid plug home') >= 0
+
 Execute (plug#begin(path)):
  call plug#begin(g:temp_plugged.'/')
  Assert g:plug_home !~ '[/\\]$', 'Trailing / should be stripped from g:plug_home'
@@ -34,7 +41,7 @@ Execute (Subsequent plug#begin() calls will reuse g:plug_home):
 Execute (Test Plug command):
 ^ Git repo with branch (DEPRECATED. USE BRANCH OPTION)
  Plug 'junegunn/seoul256.vim', { 'branch': 'yes-t_co' }
-  AssertEqual 'file:///tmp/junegunn/seoul256.vim', g:plugs['seoul256.vim'].uri
+  AssertEqual 'file:///tmp/vim-plug-test/junegunn/seoul256.vim', g:plugs['seoul256.vim'].uri
  AssertEqual join([g:temp_plugged, 'seoul256.vim/'], '/'), g:plugs['seoul256.vim'].dir
  AssertEqual 'yes-t_co', g:plugs['seoul256.vim'].branch

@@ -42,29 +49,62 @@ 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/junegunn/goyo.vim', g:plugs['goyo.vim'].uri
+  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/jg/vim-emoji'
-  AssertEqual 'file:///tmp/jg/vim-emoji', g:plugs['vim-emoji'].uri
-  AssertEqual 'master', g:plugs['vim-emoji'].branch
+  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
+  AssertEqual 'file:///tmp/vim-plug-test/jg/vim-emoji', g:plugs['vim-emoji'].uri
+  AssertEqual '', g:plugs['vim-emoji'].branch
  AssertEqual join([g:temp_plugged, 'vim-emoji/'], '/'), g:plugs['vim-emoji'].dir

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

  AssertEqual 4, len(g:plugs)

+  redir => out
+  Plug 'beauty256'
+  redir END
+  Assert out =~ 'Invalid argument: beauty256'
+
 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
@@ -84,7 +124,7 @@ Execute (PlugClean before installation):

 Execute (plug#end() updates &rtp):
  " Plug 'junegunn/goyo.vim', { 'tag': '1.5.3' }
-  " Plug 'file:///tmp/jg/vim-emoji'
+  " Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
  " Plug 'beauty256'
  " Plug 'junegunn/seoul256.vim', { 'branch': 'no-t_co', 'rtp': '././' }
  call plug#end()
@@ -159,7 +199,7 @@ Expect:
 Execute (Change branch of seoul256.vim):
  call plug#begin()
  Plug 'junegunn/seoul256.vim'
-  Plug 'file:///tmp/jg/vim-emoji'
+  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
  call plug#end()

 Execute (PlugStatus):
@@ -197,25 +237,25 @@ Expect:
 Execute (Change URI of seoul256.vim):
  call plug#begin()
  Plug 'junegunn.choi/seoul256.vim'
-  Plug 'file:///tmp/jg/vim-emoji'
+  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
  call plug#end()

 Execute (PlugStatus):
  call PlugStatusSorted()

 Expect:
-      Expected:    file:///tmp/junegunn.choi/seoul256.vim
-      Invalid URI: file:///tmp/junegunn/seoul256.vim
+      Expected:    file:///tmp/vim-plug-test/junegunn.choi/seoul256.vim
+      Invalid URI: file:///tmp/vim-plug-test/junegunn/seoul256.vim
      PlugClean required.
  - vim-emoji: OK
  Finished. 1 error(s).
  [==]
  x seoul256.vim:

-Execute (Corrected the URI but diverged from master):
+Execute (Corrected the URI but ahead of upstream):
  call plug#begin()
  Plug 'junegunn/seoul256.vim'
-  Plug 'file:///tmp/jg/vim-emoji'
+  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
  call plug#end()
  for _ in range(3)
    call system(printf('cd "%s" && git commit --allow-empty -m "dummy"', g:plugs['seoul256.vim'].dir))
@@ -223,8 +263,8 @@ Execute (Corrected the URI but diverged from master):
  call PlugStatusSorted()

 Expect:
-      Diverged from origin/master by 3 commit(s).
-      Reinstall after PlugClean.
+      Ahead of origin/master by 3 commit(s).
+      Cannot update until local changes are pushed.
  - vim-emoji: OK
  Finished. 1 error(s).
  [==]
@@ -237,11 +277,44 @@ Expect:
 #   q
 #   PGdd

-Execute (PlugClean! to remove seoul256.vim):
+Execute (PlugClean! keeps seoul256.vim):
  PlugClean!
-  " Three removed, emoji left
-  AssertEqual 'Removed.', getline(4)
-  AssertExpect '^- ', 3
+  " Two removed, emoji and seoul256 left
+  AssertEqual 'Removed 2 directories.', getline(4)
+  AssertExpect '^\~ ', 2
+  AssertExpect 'Diverged', 0
+  Assert !empty(globpath(&rtp, 'colors/seoul256.vim'))
+  Assert !empty(globpath(&rtp, 'autoload/emoji.vim'))
+  q
+
+Execute (Make seoul256 to be diverged):
+  call plug#begin()
+  Plug 'junegunn/seoul256.vim'
+  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
+  call plug#end()
+  call system(printf(join([
+    \ 'cd "%s"',
+    \ 'git fetch --unshallow',
+    \ 'git reset "@{u}~1"',
+    \ 'git commit --allow-empty -m "diverged1"',
+    \ 'git commit --allow-empty -m "diverged2"'], ' && '),
+    \ g:plugs['seoul256.vim'].dir))
+  Assert empty(v:shell_error), 'Got shell error: '.v:shell_error
+  call PlugStatusSorted()
+
+Expect:
+      Backup local changes and run PlugClean and PlugUpdate to reinstall it.
+      Diverged from origin/master (2 commit(s) ahead and 1 commit(s) behind!
+  - vim-emoji: OK
+  Finished. 1 error(s).
+  [==]
+  x seoul256.vim:
+
+Execute (PlugClean! removes seoul256.vim):
+  PlugClean!
+  " One removed, emoji left
+  AssertEqual 'Removed 1 directories.', getline(4)
+  AssertExpect '^\~ ', 1
  AssertExpect 'Diverged', 1
  Assert empty(globpath(&rtp, 'colors/seoul256.vim'))
  Assert !empty(globpath(&rtp, 'autoload/emoji.vim'))
@@ -257,8 +330,8 @@ Execute (PlugStatus):
  call PlugStatusSorted()

 Expect:
-      Expected:    file:///tmp/junegunn/vim-emoji
-      Invalid URI: file:///tmp/jg/vim-emoji
+      Expected:    file:///tmp/vim-plug-test/junegunn/vim-emoji
+      Invalid URI: file:///tmp/vim-plug-test/jg/vim-emoji
      Not found. Try PlugInstall.
      PlugClean required.
  Finished. 2 error(s).
@@ -268,10 +341,10 @@ Expect:

 Execute (PlugClean! to remove vim-emoji):
  PlugClean!
-  AssertExpect '^- ', 1
-  AssertEqual 'Removed.', getline(4)
-  Assert empty(globpath(&rtp, 'colors/seoul256.vim'))
-  Assert empty(globpath(&rtp, 'autoload/emoji.vim'))
+  AssertExpect '^\~ ', 1
+  AssertEqual 'Removed 1 directories.', getline(4)
+  Assert empty(globpath(&rtp, 'colors/seoul256.vim')), 'seoul256.vim was removed'
+  Assert empty(globpath(&rtp, 'autoload/emoji.vim')), 'emoji was removed'
  q

 Execute (PlugUpdate to install both again):
@@ -283,7 +356,7 @@ Execute (PlugUpdate to install both again):

 Execute (PlugUpdate only to find out plugins are up-to-date, D key to check):
  PlugUpdate
-  AssertExpect 'Already up-to-date', 2
+  AssertExpect 'Already up.to.date', 2, 'Expected 2 times "Already up-to-date", but got: '.string(getline(1, '$'))
  normal D
  AssertEqual '0 plugin(s) updated.', getline(1)
  q
@@ -300,7 +373,7 @@ Execute (PlugDiff - 'No updates.'):
 Execute (New commits on remote, PlugUpdate, then PlugDiff):
  for repo in ['seoul256.vim', 'vim-emoji']
    for _ in range(2)
-      call system(printf('cd /tmp/junegunn/%s && git commit --allow-empty -m "update"', repo))
+      call system(printf('cd /tmp/vim-plug-test/junegunn/%s && git commit --allow-empty -m "update"', repo))
    endfor
  endfor
  unlet repo
@@ -309,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
@@ -325,8 +399,15 @@ Execute (New commits on remote, PlugUpdate, then PlugDiff):
  AssertEqual 1, &previewwindow
  AssertEqual 'git', &filetype

-  " Back to plug window
-  wincmd p
+  " Close preview window
+  pclose
+
+  " Open and go to preview window with a custom mapping
+  nmap <buffer> <c-o> <plug>(plug-preview)<c-w>P
+  execute "normal \<c-o>"
+  AssertEqual 1, &previewwindow, 'Should be on preview window'
+  normal q
+  AssertEqual 0, &previewwindow, 'Should not be on preview window'

  " ]] motion
  execute 'normal $]]'
@@ -347,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
@@ -365,6 +450,48 @@ Execute (New commits on remote, PlugUpdate, then PlugDiff):
  AssertEqual 1, &previewwindow
  pclose

+Execute (Test g:plug_pwindow):
+  let g:plug_pwindow = 'below 5new'
+  PlugDiff
+  AssertExpect '^- ', 1
+  execute "normal ]]jo"
+
+  AssertEqual 0, &previewwindow
+  AssertEqual 1, winnr()
+  wincmd P
+  AssertEqual 1, &previewwindow
+  AssertEqual 2, winnr()
+  AssertEqual 5, winheight('.')
+  wincmd p
+
+  " Close preview window
+  normal q
+
+  " Close main window
+  normal q
+  unlet g:plug_pwindow
+
+Execute (#572 - Commit preview should work with non-POSIX-compliant &shell):
+  " Invalid shell
+  let shell = &shell
+  set shell=shellfish
+
+  try
+    " Preview commit should still work
+    PlugDiff
+    execute "normal ]]jo"
+    wincmd P
+    Log getline(1, '$')
+    Assert getline(1) =~ 'commit', 'Preview window is empty'
+    AssertEqual 'shellfish', &shell
+  finally
+    " Restore &shell
+    let &shell = shell
+    unlet shell
+    pclose
+    q
+  endtry
+
 Execute (Reuse Plug window in another tab):
  let tabnr = tabpagenr()
  PlugDiff
@@ -448,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 ~
 **********************************************************************
@@ -455,7 +627,7 @@ Execute (PlugDiff):
 Execute (Trying to execute on-demand commands when plugin is not installed):
  call ReloadPlug()
  call plug#begin()
-  Plug 'junegunn/vim-easy-align', { 'on': ['EasyAlign', 'LiveEasyAlign'] }
+  Plug 'junegunn/vim-easy-align', { 'on': ['EasyAlign', 'LiveEasyAlign!'] }
  call plug#end()

  Assert exists(':EasyAlign')
@@ -596,7 +768,7 @@ Execute (PlugStatus should point out that the plugin is missing):
 Execute (Deploy unmanaged plugin):
  Assert !exists(':FZF'), ':FZF command should not exist'
  call RmRf(fzf)
-  Log system(printf('cp -r "/tmp/fzf" "%s"', fzf))
+  Log system(printf('cp -r "/tmp/vim-plug-test/fzf" "%s"', fzf))

 Execute (PlugUpdate still should not care):
  PlugUpdate
@@ -769,7 +941,7 @@ Execute (On update):
  call plug#end()

  " New commits on remote
-  call system('cd /tmp/junegunn/vim-pseudocl && git commit --allow-empty -m "update"')
+  call system('cd /tmp/vim-plug-test/junegunn/vim-pseudocl && git commit --allow-empty -m "update"')

  silent PlugUpdate
  Log getline(1, '$')
@@ -841,7 +1013,12 @@ Execute (PlugUpdate!):
 Execute (When submodules are not initialized):
  call system(printf('cd %s && git submodule deinit subsubmodule', g:plugs['subsubmodule'].dir))

+^ #481 submodule update should use standard shell
+  let sh = &shell
+  set sh=/bin/echo
  silent PlugUpdate!
+  let &shell = sh
+  unlet sh
  q
  AssertEqual ' ', system(printf('cd %s && git submodule status', g:plugs['subsubmodule'].dir))[0],
    \ 'subsubmodule/subsubmodule should be initialized'
@@ -856,7 +1033,7 @@ Execute (Using Funcref):
  Plug 'junegunn/vim-pseudocl',   { 'do': function('PlugUpdated') }
  call plug#end()

-  call system('cd /tmp/junegunn/vim-easy-align && git commit --allow-empty -m "update"')
+  call system('cd /tmp/vim-plug-test/junegunn/vim-easy-align && git commit --allow-empty -m "update"')
  call system('cd '.g:plugs['vim-easy-align'].dir.' && git reset --hard HEAD^')
  call RmRf(g:plugs['vim-pseudocl'].dir)

@@ -897,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)
@@ -916,8 +1094,8 @@ Execute (Should not run when failed to update):
  call system(printf('cd %s && git remote set-url origin xxx', g:plugs['vim-easy-align'].dir))

  " New commits on remote
-  call system('cd /tmp/junegunn/vim-easy-align && git commit --allow-empty -m "update"')
-  call system('cd /tmp/junegunn/vim-pseudocl && git commit --allow-empty -m "update"')
+  call system('cd /tmp/vim-plug-test/junegunn/vim-easy-align && git commit --allow-empty -m "update"')
+  call system('cd /tmp/vim-plug-test/junegunn/vim-pseudocl && git commit --allow-empty -m "update"')

  silent PlugUpdate
  Log getline(1, '$')
@@ -928,18 +1106,52 @@ Execute (Should not run when failed to update):
  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/not-failed'),
    \ 'vim-pseudocl/not-failed should exist'

+Execute (Vim command with : prefix):
+  call plug#begin()
+  Plug 'junegunn/vim-pseudocl', { 'do': ':call setline(2, 12345)' }
+  call plug#end()
+
+  PlugInstall!
+  Log getline(1, '$')
+  AssertEqual '12345', getline(2)
+  q
+
+Execute (Vim command with : prefix closing the window):
+  call plug#begin()
+  Plug 'junegunn/vim-pseudocl', { 'do': ':close' }
+  call plug#end()
+
+  redir => out
+  PlugInstall!
+  redir END
+  Assert out =~ 'vim-plug was terminated'
+  Assert out =~ 'of vim-pseudocl'
+
+Execute (Invalid vim command in post-update hook):
+  call plug#begin()
+  Plug 'junegunn/vim-pseudocl', { 'do': ':nosuchcommand' }
+  call plug#end()
+
+  PlugInstall!
+  Log getline(1, '$')
+  AssertExpect! 'x Post-update hook for vim-pseudocl ... Vim:E492: Not an editor command: nosuchcommand', 1
+  q
+
 **********************************************************************
 ~ Overriding `dir`
 **********************************************************************

 Execute (Using custom dir):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align'
+  call plug#end()
  Assert isdirectory(g:plugs['vim-easy-align'].dir)

-  call RmRf('/tmp/easy-align')
+  call RmRf('/tmp/vim-plug-test/easy-align')
  call plug#begin()
-  Plug 'junegunn/vim-easy-align', { 'dir': '/tmp/easy-align' }
+  Plug 'junegunn/vim-easy-align', { 'dir': '/tmp/vim-plug-test/easy-align' }
  call plug#end()
-  AssertEqual '/tmp/easy-align/', g:plugs['vim-easy-align'].dir
+  AssertEqual '/tmp/vim-plug-test/easy-align/', g:plugs['vim-easy-align'].dir

  PlugClean!
  Assert !isdirectory(g:plugs['vim-easy-align'].dir)
@@ -1009,16 +1221,28 @@ Before:
 **********************************************************************

 Execute (plug#helptags):
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx'
+  Plug '$PLUG_FIXTURES/yyy', { 'rtp': 'rtp' }
+  call plug#end()
  silent! call delete(expand('$PLUG_FIXTURES/xxx/doc/tags'))
+  silent! call delete(expand('$PLUG_FIXTURES/yyy/rtp/doc/tags'))
  Assert !filereadable(expand('$PLUG_FIXTURES/xxx/doc/tags'))
+  Assert !filereadable(expand('$PLUG_FIXTURES/yyy/rtp/doc/tags'))
  AssertEqual 1, plug#helptags()
  Assert filereadable(expand('$PLUG_FIXTURES/xxx/doc/tags'))
+  Assert filereadable(expand('$PLUG_FIXTURES/yyy/rtp/doc/tags'))

 **********************************************************************
 ~ Manual loading
 **********************************************************************

 Execute (plug#load - invalid arguments):
+  call ResetPlug()
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx', { 'for': 'xxx' }
+  Plug '$PLUG_FIXTURES/yyy', { 'for': 'yyy' }
+  call plug#end()
  AssertEqual 0, plug#load()
  AssertEqual 0, plug#load('non-existent-plugin')
  AssertEqual 0, plug#load('non-existent-plugin', 'another-non-existent-plugin')
@@ -1026,6 +1250,12 @@ Execute (plug#load - invalid arguments):
  AssertEqual 0, plug#load('xxx', 'non-existent-plugin')
  AssertEqual 0, plug#load('non-existent-plugin', 'xxx')

+Execute (plug#load - list argument (#638)):
+  redir => out
+  call plug#load(keys(g:plugs))
+  redir END
+  AssertEqual '', out
+
 Execute (on: []):
  call plug#begin()
  Plug 'junegunn/rust.vim', { 'on': [] }
@@ -1120,7 +1350,7 @@ Execute (Using g:plug_url_format):
  let g:plug_url_format = 'git@bitbucket.org:%s.git'
  Plug 'junegunn/seoul256.vim'
  let g:plug_url_format = 'git@bitsocket.org:%s.git'
-  Plug 'beauty256'
+  Plug 'vim-scripts/beauty256'
  AssertEqual 'git@bitbucket.org:junegunn/seoul256.vim.git', g:plugs['seoul256.vim'].uri
  AssertEqual 'git@bitsocket.org:vim-scripts/beauty256.git', g:plugs['beauty256'].uri
  let g:plug_url_format = prev_plug_url_format
@@ -1251,15 +1481,16 @@ 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
  PlugClean!
-  AssertExpect '^- ', 2
+  AssertExpect '^\~ ', 2
  AssertExpect 'Already clean', 0

  PlugClean!
-  AssertExpect '^- ', 0
+  AssertExpect '^\~ ', 0
  AssertExpect 'Already clean', 1
  q

@@ -1363,8 +1594,9 @@ Execute (Commit hash support):
  call plug#end()
  PlugUpdate
  Log getline(1, '$')
-  AssertEqual 'x goyo.vim: error: pathspec ''ffffffff'' did not match any file(s) known to git.', getline(5)
-  AssertEqual 0, stridx(getline(6), '- vim-emoji: HEAD is now at 9db7fcf...')
+  AssertEqual 'x goyo.vim:', getline(5)
+  AssertEqual '    fatal: invalid reference: ffffffff', getline(6)
+  AssertEqual 0, stridx(getline(7), '- vim-emoji: HEAD is now at 9db7fcf')

  let hash = system(printf('cd %s && git rev-parse HEAD', g:plugs['vim-emoji'].dir))[:-2]
  AssertEqual '9db7fcfee0d90dafdbcb7a32090c0a9085eb054a', hash
@@ -1419,10 +1651,10 @@ Execute (#371 - 'as' option):
  Assert g:plugs.yogo.dir =~# '/yogo/$'

  call plug#begin()
-  Plug 'junegunn/goyo.vim', {'as': 'yogo', 'dir': '/tmp/gogo'}
+  Plug 'junegunn/goyo.vim', {'as': 'yogo', 'dir': '/tmp/vim-plug-test/gogo'}
  call plug#end()
  AssertEqual ['yogo'], sort(keys(g:plugs))
-  AssertEqual '/tmp/gogo/', g:plugs.yogo.dir
+  AssertEqual '/tmp/vim-plug-test/gogo/', g:plugs.yogo.dir

 Execute (#427 - Tag option with wildcard (requires git 1.9.2 or above)):
  if str2nr(split(split(system('git --version'))[-1], '\.')[0]) < 2
@@ -1437,3 +1669,91 @@ Execute (#427 - Tag option with wildcard (requires git 1.9.2 or above)):
    q
    AssertEqual '2.9.7', GitTag('vim-easy-align')
  endif
+
+Execute (#530 - Comparison of compatible git URIs):
+  " .git suffix
+  Assert CompareURI('https://github.com/junegunn/vim-plug.git', 'https://github.com/junegunn/vim-plug')
+
+  " user@
+  Assert CompareURI('https://github.com/junegunn/vim-plug.git', 'https://user@github.com/junegunn/vim-plug.git')
+
+  " git::@
+  Assert CompareURI('https://github.com/junegunn/vim-plug.git', 'https://git::@github.com/junegunn/vim-plug.git')
+
+  " https and ssh
+  Assert CompareURI('https://github.com/junegunn/vim-plug.git', 'git@github.com:junegunn/vim-plug.git')
+
+  " file://
+  Assert CompareURI('file:///tmp/vim-plug', '/tmp/vim-plug')
+  Assert CompareURI('file:///tmp/vim-plug', '/tmp/vim-plug/')
+
+Execute (#530 - Comparison of incompatible git URIs):
+  " Different hostname
+  Assert !CompareURI('https://github.com/junegunn/vim-plug.git', 'https://bitbucket.com/junegunn/vim-plug.git')
+
+  " Different repository
+  Assert !CompareURI('https://github.com/junegunn/vim-plug.git', 'https://github.com/junegunn/emacs-plug.git')
+
+  " Different port
+  Assert !CompareURI('https://github.com/junegunn/vim-plug.git', 'https://github.com:12345/junegunn/vim-plug.git')
+
+Execute (#532 - Reuse plug window):
+  call plug#begin()
+  Plug 'junegunn/goyo.vim'
+  call plug#end()
+  PlugInstall
+  call system(printf('cd "%s" && git commit --allow-empty -m "dummy"', g:plugs['goyo.vim'].dir))
+
+  PlugDiff
+  AssertEqual 1, winnr(), 'Current window is #1 after PlugDiff (but is '.winnr().')'
+  AssertEqual 2, winnr('$'), 'Two windows after PlugDiff (but got '.winnr('$').')'
+
+  " Open preview window
+  execute "normal ]]jo"
+  AssertEqual 2, winnr(), 'Current window is #2 after opening preview (but is '.winnr().')'
+  AssertEqual 3, winnr('$'), 'Three windows with preview (but got '.winnr('$').')'
+
+  " Move plug window to the right
+  wincmd L
+  AssertEqual 3, winnr(), 'Current window is #3 after moving window (but is '.winnr().')'
+  AssertEqual 3, winnr('$'), 'Three windows after moving window (but got '.winnr('$').')'
+
+  " Reuse plug window. Preview window is closed.
+  PlugStatus
+  AssertEqual 2, winnr(), 'Current window is #2 after PlugStatus (but is '.winnr().')'
+  AssertEqual 2, winnr('$'), 'Three windows after PlugStatus (but got '.winnr('$').')'
+  q
+
+Execute (#766 - Allow cloning into an empty directory):
+  let d = '/tmp/vim-plug-test/goyo-already'
+  call system('rm -rf ' . d)
+  call mkdir(d)
+  call plug#begin()
+  Plug 'junegunn/goyo.vim', { 'dir': d }
+  call plug#end()
+  PlugInstall
+  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