From 7810a37eb8bc8aaccba153f76eaf543e854865eb Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 4 Oct 2025 19:19:39 +0200
Subject: [PATCH 1/4] Improve vim plugin error message

Split the error message between vim version and
python3 support missing. This make things clearer
for the user.
---
 CHANGES.md       |  2 ++
 plugin/black.vim | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d3e8b3d82ff..dd8eea7a8d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -48,6 +48,8 @@
 - Enhance GitHub Action `psf/black` to support the `required-version` major-version-only
   "stability" format when using pyproject.toml (#4770)
 
+- Improve error message for vim plugin users. It now handles independently vim version and python support missing (#4437)
+
 ### Documentation
 
 <!-- Major changes to documentation and policies. Small docs changes
diff --git a/plugin/black.vim b/plugin/black.vim
index 84dfc256f8e..0ecbef4c5ab 100644
--- a/plugin/black.vim
+++ b/plugin/black.vim
@@ -20,12 +20,21 @@ if exists("g:load_black")
 endif
 
 if v:version < 700 || !has('python3')
-    func! __BLACK_MISSING()
-        echo "The black.vim plugin requires vim7.0+ with Python 3.9 support."
+    func! __ERROR()
+        let messages = []
+
+        if v:version < 700
+          call add(messages, "vim7.0+")
+        endif
+        if !has('python3')
+          call add(messages, "Python 3.9 support")
+        endif
+
+        echo "The black.vim plugin requires" join(messages, " and ")
     endfunc
-    command! Black :call __BLACK_MISSING()
-    command! BlackUpgrade :call __BLACK_MISSING()
-    command! BlackVersion :call __BLACK_MISSING()
+    command! Black :call __ERROR()
+    command! BlackUpgrade :call __ERROR()
+    command! BlackVersion :call __ERROR()
     finish
 endif
 

From d82a9e2962b8831473d6041e0275b0248d36db49 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 4 Oct 2025 17:47:25 +0000
Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index dd8eea7a8d1..f4729c87c96 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -48,7 +48,8 @@
 - Enhance GitHub Action `psf/black` to support the `required-version` major-version-only
   "stability" format when using pyproject.toml (#4770)
 
-- Improve error message for vim plugin users. It now handles independently vim version and python support missing (#4437)
+- Improve error message for vim plugin users. It now handles independently vim version
+  and python support missing (#4437)
 
 ### Documentation
 

From ad2ed60ab12d35ebaaf19b508a8fa88d89fab420 Mon Sep 17 00:00:00 2001
From: cobalt <61329810+cobaltt7@users.noreply.github.com>
Date: Sun, 5 Oct 2025 15:50:23 -0500
Subject: [PATCH 3/4] Update CHANGES.md

---
 CHANGES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index f4729c87c96..0071ebe5f9b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -47,7 +47,6 @@
 
 - Enhance GitHub Action `psf/black` to support the `required-version` major-version-only
   "stability" format when using pyproject.toml (#4770)
-
 - Improve error message for vim plugin users. It now handles independently vim version
   and python support missing (#4437)
 

From 46636627d9e422650c5ccd937dd445f7d6185624 Mon Sep 17 00:00:00 2001
From: cobalt <61329810+cobaltt7@users.noreply.github.com>
Date: Sun, 5 Oct 2025 15:54:57 -0500
Subject: [PATCH 4/4] Update CHANGES.md

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index fb14b8b16a9..05a914c26f3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -48,7 +48,7 @@
 - Enhance GitHub Action `psf/black` to support the `required-version` major-version-only
   "stability" format when using pyproject.toml (#4770)
 - Improve error message for vim plugin users. It now handles independently vim version
-  and python support missing (#4437)
+- Vim: Warn on unsupported Vim and Python versions independently (#4772)
 - Vim: Print the import paths when importing black fails (#4675)
 - Vim: Fix handling of virtualenvs that have a different Python version (#4675)