From 289b6472d4a0d41ea6028416d4942794c98856f7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 17:46:43 +0100
Subject: [PATCH] Mark release 5.0

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

diff --git a/bin/release b/bin/release
index c6b97c1c03..9b58b872d8 100755
--- a/bin/release
+++ b/bin/release
@@ -42,5 +42,5 @@ rewrite("doc/compress.html", function(cmp) {
 
 rewrite("index.html", function(index) {
   return index.replace(/\.zip">\d+\.\d+<\/a>/,
-                       ".zip>" + simple + "</a>");
+                       ".zip\">" + simple + "</a>");
 });
diff --git a/bower.json b/bower.json
index dad8fe2e02..c59f2d9d27 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.13.0",
+  "version":"5.0.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index 7d89eb4520..a376c86d2d 100644
--- a/doc/compress.html
+++ b/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=5.0.0;f=">5.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.13.0;f=">4.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.12.0;f=">4.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.11.0;f=">4.11</option>
diff --git a/doc/manual.html b/doc/manual.html
index 9f3fa36763..74a74e29ed 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1976,8 +1976,11 @@ <h3 id="api_misc">Miscellaneous methods</h3>
       <dt id="focus"><code><strong>cm.focus</strong>()</code></dt>
       <dd>Give the editor focus.</dd>
 
-      <dt id="getInputField"><code><strong>cm.getInputField</strong>() → TextAreaElement</code></dt>
-      <dd>Returns the hidden textarea used to read input.</dd>
+      <dt id="getInputField"><code><strong>cm.getInputField</strong>() → Element</code></dt>
+      <dd>Returns the input field for the editor. Will be a textarea
+      or an editable div, depending on the value of
+      the <a href="#option_inputStyle"><code>inputStyle</code></a>
+      option.</dd>
       <dt id="getWrapperElement"><code><strong>cm.getWrapperElement</strong>() → Element</code></dt>
       <dd>Returns the DOM node that represents the editor, and
       controls its size. Remove this from your tree to delete an
diff --git a/doc/releases.html b/doc/releases.html
index 7e0f4bf338..8b2b375253 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">20-02-2015: <a href="http://codemirror.net/codemirror-5.0.zip">Version 5.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)</li>
+    <li>New option <a href="manual.html#option_inputStyle"><code>inputStyle</code></a> to switch between hidden textarea and contenteditable input.</li>
+    <li>The <a href="manual.html#getInputField"><code>getInputField</code></a>
+    method is no longer guaranteed to return a textarea.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">20-02-2015: <a href="http://codemirror.net/codemirror-4.13.zip">Version 4.13</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index eaa7f80f35..3813fda1b1 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>4.13</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a> or<br>
       read the <a href="doc/releases.html">release notes</a>.<br>
       There is a <a href="doc/compress.html">minification helper</a>.
@@ -188,9 +188,9 @@ <h2>Browser support</h2>
     <tr><th style="padding-right: 1em;">Internet Explorer</th><td>version 8 and up</td></tr>
     <tr><th>Opera</th><td>version 9 and up</td></tr>
   </table>
-  <p>Modern mobile browsers tend to partly work. Bug reports and
-  patches for mobile support are welcome, but the maintainer does not
-  have the time or budget to actually work on it himself.</p>
+  <p>Support for modern mobile browsers is experimental. Recent
+  versions of the iOS browser and Chrome on Android should work
+  pretty well.</p>
 </section>
 
 </article>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 33356c8840..53b35329fc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8639,7 +8639,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.13.0";
+  CodeMirror.version = "5.0.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 5801a6c860..b4a9b53fe6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.13.0",
+    "version":"5.0.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",