From 7f525bb74e547b92c7f21af2ad13a4769bb944f6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Aug 2020 10:29:36 +0200
Subject: [PATCH] Mark version 5.57.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a9e79126b6..3fa6199e41 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -113,6 +113,7 @@ Bert Chang
 Bharad
 BigBlueHat
 Billy Moon
+Bin Ni
 binny
 Bjorn Hansen
 B Krishna Chaitanya
@@ -313,6 +314,7 @@ Hakan Tunc
 Hanno Fellmann
 Hans Engel
 Hanzhao Deng
+Haoran Yu
 Harald Schilly
 Hardest
 Harshvardhan Gupta
@@ -329,6 +331,7 @@ hidaiy
 Hiroyuki Makino
 hitsthings
 Hocdoc
+Howard
 Hugues Malphettes
 Ian Beck
 Ian Davies
@@ -492,6 +495,7 @@ Lorenzo Simionato
 Lorenzo Stoakes
 Louis Mauchet
 Luca Fabbri
+Lucas Buchala
 Luciano Longo
 Luciano Santana
 Lu Fangjian
@@ -637,6 +641,7 @@ Olivia Ytterbrink
 Opender Singh
 opl-
 Oreoluwa Onatemowo
+orionlee
 oscar.lofwenhamn
 Oskar Segersvärd
 ossdev
@@ -821,6 +826,7 @@ Tobias Bertelsen
 TobiasBg
 Todd Berman
 Todd Kennedy
+tokafew420
 Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13039b9701..8e651ec7ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 5.57.0 (2020-08-20)
+
+### Bug fixes
+
+Fix issue that broke binding the macOS Command key.
+
+[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Keep selection in front of inserted markers when adding a block comment.
+
+[css mode](https://codemirror.net/mode/css/): Recognize more properties and value names.
+
+[annotatescrollbar addon](https://codemirror.net/doc/manual.html#addon_annotatescrollbar): Don't hide matches in collapsed content.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Support tag text objects in xml and html modes.
+
 ## 5.56.0 (2020-07-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 9c04d7fadf..8635a1e060 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,7 @@
 <section class=first id=overview>
     <h2 style="position: relative">
       User manual and reference guide
-      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.56.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.57.0</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/doc/releases.html b/doc/releases.html
index 6ab175a7b3..334a0184c6 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-08-2020: <a href="https://codemirror.net/codemirror-5.57.0.zip">Version 5.57.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix issue that broke binding the macOS Command key.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Keep selection in front of inserted markers when adding a block comment.</li>
+    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Recognize more properties and value names.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_annotatescrollbar">annotatescrollbar addon</a>: Don’t hide matches in collapsed content.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support tag text objects in xml and html modes.</li>
+  </ul>
+
   <p class="rel">20-07-2020: <a href="https://codemirror.net/codemirror-5.56.0.zip">Version 5.56.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 8ee9b384b2..f4ac53c0b9 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.56.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.57.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 374bd877d2..faf0ca08b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.56.0",
+  "version": "5.57.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 3b378e8f33..64e94929dd 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.56.0"
+CodeMirror.version = "5.57.0"