From eac70bb1a31a08201e5705c788cd72e6283958f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Apr 2021 10:18:32 +0200
Subject: [PATCH] Mark version 5.61.0

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

diff --git a/AUTHORS b/AUTHORS
index 2d6d422fc..125abd4f2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@ Abhishek Gahlot
 Adam Ahmed
 Adam King
 Adam Particka
+Adam Wight
 adanlobato
 Adán Lobato
 Aditya Toshniwal
@@ -28,6 +29,7 @@ AlbertHilb
 Alberto González Palomo
 Alberto Pose
 Albert Xing
+Alexander Marks
 Alexander Pavlov
 Alexander Schepanovski
 Alexander Shvets
@@ -265,6 +267,7 @@ Fauntleroy
 fbuchinger
 feizhang365
 Felipe Lalanne
+Felipe S. S. Schneider
 Felix Raab
 ficristo
 Filip Noetzel
@@ -477,6 +480,7 @@ Kim-Anh Tran
 Klaus Silveira
 Koh Zi Han, Cliff
 komakino
+Konstantin Chernenko
 Konstantin Lopuhin
 koops
 Kris Ciccarello
@@ -589,6 +593,7 @@ meshuamam
 Metatheos
 Micah Dubinko
 Michael
+Michael Chirico
 Michael Goderbauer
 Michael Grey
 Michael Kaminsky
@@ -798,6 +803,7 @@ silverwind
 Simon Edwards
 Simon Huber
 sinkuu
+Slava Rozhnev
 snasa
 soliton4
 sonson
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1772b5aa9..fbf4abcd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 5.61.0 (2021-04-20)
+
+### Bug fixes
+
+Improve support for being in a shadow DOM in contenteditable mode.
+
+Prevent line number from being read by screen readers.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix a crash caused by a race condition.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Improve scope tracking.
+
+### New features
+
+The library now emits an `"updateGutter"` event when the gutter width changes.
+
+[emacs bindings](https://codemirror.net/demo/emacs.html): Provide named commands for all bindings.
+
 ## 5.60.0 (2021-03-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index d27e37f58..565c50649 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.60.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.61.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 ae2622fa1..da16abfe7 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,17 @@
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2021: <a href="https://codemirror.net/codemirror-5.61.0.zip">Version 5.61.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>The library now emits an <code>"updateGutter"</code> event when the gutter width changes.</li>
+    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Provide named commands for all bindings.</li>
+    <li>Improve support for being in a shadow DOM in contenteditable mode.</li>
+    <li>Prevent line number from being read by screen readers.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix a crash caused by a race condition.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve scope tracking.</li>
+  </ul>
+
   <p class="rel">20-03-2021: <a href="https://codemirror.net/codemirror-5.60.0.zip">Version 5.60.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 09ee9d3ac..9180f4c09 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.60.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.61.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 6bcff708a..66e0d9fb3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.60.0",
+  "version": "5.61.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 2d63991b5..b7972279d 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.60.0"
+CodeMirror.version = "5.61.0"