From 5dee39fa4f6447f1f3359f254795325ed282eb8e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Mar 2014 11:35:37 +0100
Subject: [PATCH] Tag 4.0 release candidate 1

---
 AUTHORS           | 10 ++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 9af00e54..464249d7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,14 +3,17 @@ List of CodeMirror contributors. Updated before every release.
 4r2r
 Aaron Brooks
 Abe Fettig
+Adam Ahmed
 Adam King
 adanlobato
 Adán Lobato
+Adrian Aichner
 aeroson
 Ahmad Amireh
 Ahmad M. Zawawi
 ahoward
 Akeksandr Motsjonov
+Alberto González Palomo
 Alberto Pose
 Albert Xing
 Alexander Pavlov
@@ -46,6 +49,8 @@ Benjamin DeCoste
 Ben Keen
 Bernhard Sirlinger
 Billy Moon
+binny
+B Krishna Chaitanya
 Blaine G
 boomyjee
 borawjm
@@ -106,6 +111,7 @@ ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
 Frank Wiegand
+Gabriel Horner
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
@@ -192,6 +198,7 @@ Luciano Longo
 lynschinzer
 Maksim Lin
 Maksym Taran
+Malay Majithia
 Manuel Rego Casasnovas
 Marat Dreizin
 Marco Aurélio
@@ -238,6 +245,7 @@ ndr
 nerbert
 nextrevision
 nguillaumin
+Ng Zhi An
 Nicholas Bollweg
 Niels van Groningen
 Nikita Beloglazov
@@ -246,6 +254,7 @@ Nikolay Kostov
 nlwillia
 pablo
 Page
+Patil Arpith
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
@@ -307,6 +316,7 @@ Tom MacWright
 Tony Jian
 Travis Heppe
 Triangle717
+twifkak
 Vestimir Markov
 vf
 Volker Mische
diff --git a/doc/compress.html b/doc/compress.html
index bb2d8915..e5a77c50 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px;">
         <option value="http://codemirror.net/">HEAD</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.1;f=">4.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.22.0;f=">3.22</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.20.0;f=">3.20</option>
diff --git a/doc/manual.html b/doc/manual.html
index 345d81fe..c41c4d9b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -63,7 +63,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 4.0.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.0.1</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 57514884..3e2932b4 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -26,6 +26,14 @@
 
 <section id=v3 class=first>
 
+  <h2>Version 4.x</h2>
+
+  <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-4.0rc1.zip">Version 4.0 release candidate 1</a>:</p>
+
+  <p class="rel-note">First release candidate for 4.0, which supports
+  multiple selections, selection undo, and improved (faster, less
+  kludgy) character measuring.</p>
+
   <h2>Version 3.x</h2>
 
   <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-3.22.zip">Version 3.22</a>:</p>
diff --git a/index.html b/index.html
index d6c0c015..911382b8 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.22</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.0</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 96270f23..364c2cb0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7316,7 +7316,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.0.0";
+  CodeMirror.version = "4.0.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 8edf5e8a..484f7cdc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.0.0",
+    "version":"4.0.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",
-- 
GitLab