From 2f4fb8053021c01d1f246de2e663ac3719877610 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 21 Dec 2017 14:59:33 +0100
Subject: [PATCH] Mark version 5.33.0

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

diff --git a/AUTHORS b/AUTHORS
index 65d8480893..47c79d1577 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -144,6 +144,7 @@ CodeBitt
 coderaiser
 Cole R Lawrence
 ComFreek
+Cristian Prieto
 Curtis Gagliardi
 dagsta
 daines
@@ -385,6 +386,7 @@ Leon Sorokin
 Leonya Khachaturov
 Liam Newman
 Libo Cannici
+Lior Goldberg
 LloydMilligan
 LM
 lochel
@@ -611,6 +613,7 @@ sinkuu
 snasa
 soliton4
 sonson
+Sorab Bisht
 spastorelli
 srajanpaliwal
 Stanislav Oaserele
@@ -619,6 +622,7 @@ Stefan Borsje
 Steffen Beyer
 Steffen Bruchmann
 Steffen Kowalski
+Stephane Moore
 Stephen Lavelle
 Steve Champagne
 Steve Hoover
@@ -651,6 +655,7 @@ Tim Baumann
 Timothy Farrell
 Timothy Gu
 Timothy Hatcher
+Tobias Bertelsen
 TobiasBg
 Todd Berman
 Todd Kennedy
@@ -660,6 +665,7 @@ Tom Erik Støwer
 Tom Klancer
 Tom MacWright
 Tony Jian
+tophf
 Travis Heppe
 Triangle717
 Tristan Tarrant
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f81fcdd07b..855e6e4d9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 5.33.0 (2017-12-21)
+
+### Bug fixes
+
+[lint addon](http://codemirror.net/doc/manual.html#addon_lint): Make updates more efficient.
+
+[css mode](http://codemirror.net/mode/css/): The mode is now properly case-insensitive.
+
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Fix broken handling of unordered lists introduced in previous release.
+
+[swift](http://codemirror.net/mode/swift) and [scala](http://codemirror.net/mode/clike/) modes: Support nested block comments.
+
+[mllike mode](http://codemirror.net/mode/mllike/index.html): Improve OCaml support.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Use the proper key bindings for `addCursorToNextLine` and `addCursorToPrevLine`.
+
+### New features
+
+[jsx mode](http://codemirror.net/mode/jsx/index.html): Support JSX fragments.
+
+[closetag addon](http://codemirror.net/demo/closetag.html): Add an option to disable auto-indenting.
+
 ## 5.32.0 (2017-11-22)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 5500b9904b..37275fd9d7 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.32.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.33.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 7fb8eebef1..4051a32c55 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-12-2017: <a href="http://codemirror.net/codemirror-5.33.0.zip">Version 5.33.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="http://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Make updates more efficient.</li>
+    <li><a href="http://codemirror.net/mode/css/">css mode</a>: The mode is now properly case-insensitive.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix broken handling of unordered lists introduced in previous release.</li>
+    <li><a href="http://codemirror.net/mode/swift">swift</a> and <a href="http://codemirror.net/mode/clike/">scala</a> modes: Support nested block comments.</li>
+    <li><a href="http://codemirror.net/mode/mllike/index.html">mllike mode</a>: Improve OCaml support.</li>
+    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Use the proper key bindings for <code>addCursorToNextLine</code> and <code>addCursorToPrevLine</code>.</li>
+    <li><a href="http://codemirror.net/mode/jsx/index.html">jsx mode</a>: Support JSX fragments.</li>
+    <li><a href="http://codemirror.net/demo/closetag.html">closetag addon</a>: Add an option to disable auto-indenting.</li>
+  </ul>
+
   <p class="rel">22-11-2017: <a href="http://codemirror.net/codemirror-5.32.0.zip">Version 5.32.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index d62ab84a39..1e4df9328a 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.32.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.33.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 3ffad1d5d1..9894b4f0d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.32.1",
+  "version": "5.33.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 260f7d0af5..a49a7c2f39 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.32.1"
+CodeMirror.version = "5.33.0"