Mark release 4.2

Author: marijnh

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

doc/compress.html

@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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>

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

doc/releases.html

@@ -29,6 +29,23 @@ <h2>Release notes and version history</h2>
 
   <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">

index.html

@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </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>

lib/codemirror.js

@@ -7595,7 +7595,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.1.1";
+  CodeMirror.version = "4.2.0";
 
   return CodeMirror;
 });

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",