From 05e27d8dff324bfca50502c24b2c557905179b8f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 22 May 2018 12:34:11 +0200
Subject: [PATCH] Mark version 5.38.0

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

diff --git a/AUTHORS b/AUTHORS
index f57c98a145..2eec549bfb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -139,6 +139,7 @@ Chris Smith
 Christian Gruen
 Christian Oyarzun
 Christian Petrov
+christopherblaser
 Christopher Brown
 Christopher Kramer
 Christopher Mitchell
@@ -246,6 +247,7 @@ Giovanni Calò
 Glebov Boris
 Glenn Jorde
 Glenn Ruehle
+goldsmcb
 Golevka
 Google Inc.
 Gordon Smith
@@ -454,6 +456,7 @@ matthewhayes
 Matthew Rathbone
 Matthias Bussonnier
 Matthias BUSSONNIER
+Matt MacPherson
 Matt McDonald
 Matt Pass
 Matt Sacks
@@ -489,11 +492,13 @@ Mike Diaz
 Mike Ivanov
 Mike Kadin
 Mike Kobit
+Milan Szekely
 MinRK
 Miraculix87
 misfo
 mkaminsky11
 mloginov
+Moritz Schubotz (physikerwelt)
 Moritz Schwörer
 Moshe Wajnberg
 mps
@@ -537,6 +542,7 @@ overdodactyl
 pablo
 pabloferz
 Pablo Zubieta
+paddya
 Page
 paladox
 Panupong Pasupat
@@ -646,6 +652,7 @@ Sorab Bisht
 spastorelli
 srajanpaliwal
 Stanislav Oaserele
+stan-z
 Stas Kobzar
 Stefan Borsje
 Steffen Beyer
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8972e9aecf..5fb9bc3712 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 5.38.0 (2018-05-21)
+
+### Bug fixes
+
+Improve reliability of noticing a missing mouseup event during dragging.
+
+Make sure `getSelection` is always called on the correct document.
+
+Fix interpretation of line breaks and non-breaking spaces inserted by renderer in contentEditable mode.
+
+Work around some browsers inexplicably making the fake scrollbars focusable.
+
+Make sure `coordsChar` doesn't return positions inside collapsed ranges.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support block scopes, bindingless catch, bignum suffix, `s` regexp flag.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Adjust a wasteful regexp.
+
+[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Allow opening the control without any item selected.
+
+### New features
+
+New theme: [darcula](http://codemirror.net/demo/theme.html#darcula).
+
+[dialog addon](http://codemirror.net/doc/manual.html#addon_dialog): Add a CSS class (`dialog-opened`) to the editor when a dialog is open.
+
 ## 5.37.0 (2018-04-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 5919ef6483..c53b5bcf6f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.37.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.38.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 7919aa3e55..e7570d073c 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,21 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-05-2018: <a href="http://codemirror.net/codemirror-5.38.0.zip">Version 5.38.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Improve reliability of noticing a missing mouseup event during dragging.</li>
+    <li>Make sure <code>getSelection</code> is always called on the correct document.</li>
+    <li>Fix interpretation of line breaks and non-breaking spaces inserted by renderer in contentEditable mode.</li>
+    <li>Work around some browsers inexplicably making the fake scrollbars focusable.</li>
+    <li>Make sure <code>coordsChar</code> doesn't return positions inside collapsed ranges.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support block scopes, bindingless catch, bignum suffix, <code>s</code> regexp flag.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Adjust a wasteful regexp.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Allow opening the control without any item selected.</li>
+    <li>New theme: <a href="http://codemirror.net/demo/theme.html#darcula">darcula</a>.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_dialog">dialog addon</a>: Add a CSS class (<code>dialog-opened</code>) to the editor when a dialog is open.</li>
+  </ul>
+
   <p class="rel">20-04-2018: <a href="http://codemirror.net/codemirror-5.37.0.zip">Version 5.37.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 02ff74f82d..5bb0048eca 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.37.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.38.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 871277263f..718e17b847 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.37.1",
+  "version": "5.38.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 00f2b78f56..04541126c1 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.37.1"
+CodeMirror.version = "5.38.0"