diff --git a/AUTHORS b/AUTHORS
index 85f999f42e9c60c0ba35fde7ee4f6c20db6be1fd..f1d6b58a855804f9b5c8f11030fcb591c05f0564 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ Amy
Ananya Sen
anaran
AndersMad
+Anders Nawroth
Anderson Mesquita
Andre von Houck
Andrey Lushnikov
@@ -44,6 +45,7 @@ AtomicPages LLC
Atul Bhouraskar
Aurelian Oancea
Bastian Müller
+Bem Jones-Bey
benbro
Beni Cherniavsky-Paskin
Benjamin DeCoste
@@ -73,6 +75,7 @@ CodeAnimal
ComFreek
Curtis Gagliardi
dagsta
+daines
Dan Heberden
Daniel, Dao Quang Minh
Daniel Faust
@@ -82,6 +85,7 @@ Daniel Neel
Daniel Parnell
Danny Yoo
Darius Roberts
+Dave Myers
David Mignot
David Pathakjee
deebugger
@@ -263,6 +267,7 @@ Nikolay Kostov
nlwillia
pablo
Page
+Panupong Pasupat
paris
Patil Arpith
Patrick Strawderman
diff --git a/doc/compress.html b/doc/compress.html
index d6c01255449523a4454054ba6e79ce2258ff030e..8fb4b5fe92071881f4c096c348e2a7dbd4cd33b0 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,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.2.0;f=">4.2</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.1.0;f=">4.1</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.3;f=">4.0</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.23.0;f=">3.23</option>
diff --git a/doc/manual.html b/doc/manual.html
index 1111db8e7d1fc334fd28db022d4acaa9ec094004..77d1cc3404a64bfb05b82906bd5c3270f84d20f0 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.1.1</span>
+ <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.2.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 63397e79246b8b65c3065ceb69723cc921f37a98..5e6829b406f49ebc5aee80b68a690b83e187e7bf 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,23 @@
<h2 id="v4">Version 4.x</h2>
+ <p class="rel">19-05-2014: <a href="http://codemirror.net/codemirror-4.2.zip">Version 4.2</a>:</p>
+
+ <ul class="rel-note">
+ <li>Fix problem where some modes were broken by the fact that empty tokens were forbidden.</li>
+ <li>Several fixes to context menu handling.</li>
+ <li>On undo, scroll <em>change</em>, not cursor, into view.</li>
+ <li>Rewritten <a href="../mode/jade/index.html">Jade</a> mode.</li>
+ <li>Various improvements to <a href="../mode/shell/index.html">Shell</a> (support for more syntax) and <a href="../mode/python/index.html">Python</a> (better indentation) modes.</li>
+ <li>New mode: <a href="../mode/cypher/index.html">Cypher</a>.</li>
+ <li>New theme: <a href="../demo/theme.html?neo">Neo</a>.</li>
+ <li>Support direct styling options (color, line style, width) in the <a href="manual.html#addon_rulers">rulers</a> addon.</li>
+ <li>Recognize per-editor configuration for the <a href="manual.html#addon_show-hint">show-hint</a> and <a href="manual.html#addon_foldcode">foldcode</a> addons.</li>
+ <li>More intelligent scanning for existing close tags in <a href="manual.html#addon_closetag">closetag</a> addon.</li>
+ <li>In the <a href="../demo/vim.html">Vim bindings</a>: Fix bracket matching, support case conversion in visual mode, visual paste, append action.</li>
+ <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.1.0...4.2.0">list of patches</a>.</li>
+ </ul>
+
<p class="rel">22-04-2014: <a href="http://codemirror.net/codemirror-4.1.zip">Version 4.1</a>:</p>
<ul class="rel-note">
diff --git a/index.html b/index.html
index 0c91ecaf72d8af74ef5f38b9f87428377ac1b800..19b95297819cc89f44a692ae1f5bcb9efa7ea0f5 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 4.1</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+ <div><strong>version 4.2</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 1b938589c6cc9d05955a3a3f688405247af5fa32..104ccd7d8ea53663bd3647d6cc2d409b72f6666c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7595,7 +7595,7 @@
// THE END
- CodeMirror.version = "4.1.1";
+ CodeMirror.version = "4.2.0";
return CodeMirror;
});
diff --git a/package.json b/package.json
index 8377f5a93ec3872c88565564a170119c2d9ea3cc..ef4968b9b790db146b1e65f057b7ee5ae178f01e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "codemirror",
- "version":"4.1.1",
+ "version":"4.2.0",
"main": "lib/codemirror.js",
"description": "In-browser code editing made bearable",
"licenses": [{"type": "MIT",