From 1042abb6d8c7b9ecd69de3950144160e2686f981 Mon Sep 17 00:00:00 2001
From: aileot <46470475+aileot@users.noreply.github.com>
Date: Tue, 28 Oct 2025 23:36:38 +0900
Subject: [PATCH 1/5] ci(test): add matrix to run tests both on vim and neovim

---
 .github/workflows/ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5401a1a..ae44de6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,11 +7,21 @@ on:
 jobs:
   ci:
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        editor: [vim, neovim]
     steps:
       - uses: actions/checkout@v4
       - name: vint
         uses: reviewdog/action-vint@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: rhysd/action-setup-vim@v1
+        id: vim
+        with:
+          neovim: ${{ matrix.editor == 'neovim' }}
+          version: stable
       - name: test
+        env:
+          VIM: ${{ steps.vim.outputs.executable }}
         run: make test

From 8abd13958e06bc90dfe1bb36bfb45ea264e7e6e0 Mon Sep 17 00:00:00 2001
From: aileot <46470475+aileot@users.noreply.github.com>
Date: Thu, 30 Oct 2025 05:47:56 +0900
Subject: [PATCH 2/5] ci(test): set 'neovim' matrix in boolean

---
 .github/workflows/ci.yml | 4 ++--
 README.md                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae44de6..d868e39 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        editor: [vim, neovim]
+        neovim: [false, true]
     steps:
       - uses: actions/checkout@v4
       - name: vint
@@ -19,7 +19,7 @@ jobs:
       - uses: rhysd/action-setup-vim@v1
         id: vim
         with:
-          neovim: ${{ matrix.editor == 'neovim' }}
+          neovim: ${{ matrix.neovim }}
           version: stable
       - name: test
         env:
diff --git a/README.md b/README.md
index fde7221..6cc490d 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ Due to the `:file` redirection, you could get confused in some autocmd events:
 
 - The values of `autocmd-pattern`, `<amatch>`, and `<afile>`,
   to a symbolic link would be either the **symbolic link** itself or its
-  **resolved** path.
+  **resolved** path, depending on the triggered events.
 
 - The buffer names (by `bufname()`, or `nvim_buf_get_name()` in nvim)
   might be different from what you expect to the path as well.

From c9bda74e229ea42de7e692fa39318131d9b7f9d5 Mon Sep 17 00:00:00 2001
From: aileot <46470475+aileot@users.noreply.github.com>
Date: Thu, 30 Oct 2025 06:01:05 +0900
Subject: [PATCH 3/5] revert: "ci(test): set 'neovim' matrix in boolean"

This reverts commit f572674d0faa3482b937c904cb6606be7ff17a5c.

For more self-explanatory job names.
---
 .github/workflows/ci.yml | 4 ++--
 README.md                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d868e39..ae44de6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        neovim: [false, true]
+        editor: [vim, neovim]
     steps:
       - uses: actions/checkout@v4
       - name: vint
@@ -19,7 +19,7 @@ jobs:
       - uses: rhysd/action-setup-vim@v1
         id: vim
         with:
-          neovim: ${{ matrix.neovim }}
+          neovim: ${{ matrix.editor == 'neovim' }}
           version: stable
       - name: test
         env:
diff --git a/README.md b/README.md
index 6cc490d..fde7221 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ Due to the `:file` redirection, you could get confused in some autocmd events:
 
 - The values of `autocmd-pattern`, `<amatch>`, and `<afile>`,
   to a symbolic link would be either the **symbolic link** itself or its
-  **resolved** path, depending on the triggered events.
+  **resolved** path.
 
 - The buffer names (by `bufname()`, or `nvim_buf_get_name()` in nvim)
   might be different from what you expect to the path as well.

From 3734cb9fa8317ac1404781b3087128be29e8eab3 Mon Sep 17 00:00:00 2001
From: aileot <46470475+aileot@users.noreply.github.com>
Date: Thu, 30 Oct 2025 05:50:54 +0900
Subject: [PATCH 4/5] fix(make): correctly detect vim and nvim for flags

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 915dae7..b314922 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VIM ?= vim
 VIM_FLAGS ?= --clean -u vimrc
-ifeq ($(VIM),vim)
+ifeq ($(notdir $(VIM)),vim)
 	VIM_FLAGS += -N -Es
-else ifeq ($(VIM),nvim)
+else ifeq ($(notdir $(VIM)),nvim)
 	VIM_FLAGS += --headless
 endif
 

From eb2c0fa1c7e9ecf71a9f0cc8fe93313f4358b804 Mon Sep 17 00:00:00 2001
From: aileot <46470475+aileot@users.noreply.github.com>
Date: Thu, 30 Oct 2025 05:59:20 +0900
Subject: [PATCH 5/5] chore(make): output `$(VIM)` and `$(VIM_FLAGS)` on tests

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index b314922..435d3a4 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,8 @@ clean:
 
 .PHONY: test
 test: test/vader.vim
+	@echo Running tests against $(VIM) $(VIM_FLAGS)
+	@echo
 	@cd test && $(VIM) $(VIM_FLAGS)                                      -c 'Vader! symlink.vader'
 	@cd test && $(VIM) $(VIM_FLAGS) -R                                   -c 'Vader! symlink.vader'
 	@cd test && $(VIM) $(VIM_FLAGS)                                      -c 'Vader! symlink-edit-in-popup.vader'