X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/1fc3215e8c8856094b20d497e4e0e3e547ed38eb..65f0ea61599dc6d2be95ee961c42a55247130c49:/CHANGES.md

diff --git a/CHANGES.md b/CHANGES.md
index f911fdf..e313a44 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,14 @@
 ## Change Log
 
-### Unreleased
+### 21.4b0
 
 #### _Black_
 
+- Fixed a rare but annoying formatting instability created by the combination of
+  optional trailing commas inserted by `Black` and optional parentheses looking at
+  pre-existing "magic" trailing commas. This fixes issue #1629 and all of its many many
+  duplicates. (#2126)
+
 - `Black` now processes one-line docstrings by stripping leading and trailing spaces,
   and adding a padding space when needed to break up """". (#1740)
 
@@ -32,8 +37,6 @@
 - Added parsing support for unparenthesized tuples and yield expressions in annotated
   assignments (#1835)
 
-- use lowercase hex strings (#1692)
-
 - added `--extend-exclude` argument (PR #2005)
 
 - speed up caching by avoiding pathlib (#1950)
@@ -52,6 +55,9 @@
 
 - Exclude `venv` directory by default (#1683)
 
+- Fixed "Black produced code that is not equivalent to the source" when formatting
+  Python 2 docstrings (#2037)
+
 #### _Packaging_
 
 - Self-contained native _Black_ binaries are now provided for releases via GitHub