diff --git a/AUTHORS b/AUTHORS
index 741ba1e35e7a0f9490728e86174481936ae9c71d..c3680eb4d82ee8044553fcde6902352b251b464c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -75,6 +75,7 @@ benbro
Beni Cherniavsky-Paskin
Benjamin DeCoste
Ben Keen
+Ben Mosher
Bernhard Sirlinger
Bert Chang
Billy Moon
@@ -137,6 +138,7 @@ David Barnett
David Mignot
David Pathakjee
David Vázquez
+David Whittington
deebugger
Deep Thought
Devin Abbott
@@ -184,6 +186,7 @@ galambalazs
Gautam Mehta
Gavin Douglas
gekkoe
+geowarin
Gerard Braad
Gergely Hegykozi
Giovanni Calò
@@ -198,6 +201,7 @@ greengiant
Gregory Koberger
Guillaume MasseÌ
Guillaume Massé
+guraga
Gustavo Rodrigues
Hakan Tunc
Hans Engel
@@ -274,6 +278,7 @@ ju1ius
Juan Benavides Romero
Jucovschi Constantin
Juho Vuori
+Julien Rebetez
Justin Andresen
Justin Hileman
jwallers@gmail.com
@@ -281,6 +286,7 @@ kaniga
karevn
Kayur Patel
Ken Newman
+ken restivo
Ken Rockot
Kevin Earls
Kevin Sawicki
@@ -426,7 +432,9 @@ peter
Peter Flynn
peterkroon
Peter Kroon
+Philipp A
Philip Stadermann
+Pierre Gerold
Piët Delport
prasanthj
Prasanth J
@@ -476,6 +484,7 @@ Shiv Deepak
Shmuel Englard
Shubham Jain
silverwind
+sinkuu
snasa
soliton4
sonson
@@ -518,6 +527,7 @@ Tom MacWright
Tony Jian
Travis Heppe
Triangle717
+Tristan Tarrant
TSUYUSATO Kitsune
twifkak
Vestimir Markov
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe78c71d5ee363f4216cb380784c06540ede02a0..60ec9df51bf701ece0637e4a6e7c149e77241966 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 5.13.0 (2016-03-21)
+
+### New features
+
+New DOM event forwarded: [`"dragleave"`](http://codemirror.net/doc/manual.html#event_dom).
+
+[protobuf mode](http://codemirror.net/mode/protobuf/index.html): Newly added.
+
+### Bugfixes
+
+Fix problem where [`findMarks`](http://codemirror.net/doc/manual.html#findMarks) sometimes failed to find multi-line marks.
+
+Fix crash that showed up when atomic ranges and bidi text were combined.
+
+[show-hint addon](http://codemirror.net/demo/complete.html): Completion widgets no longer close when the line indented or dedented.
+
+[merge addon](http://codemirror.net/demo/merge.html): Fix bug when merging chunks at the end of the file.
+
+[placeholder addon](http://codemirror.net/doc/manual.html#addon_placeholder): No longer gets confused by [`swapDoc`](http://codemirror.net/doc/manual.html#swapDoc).
+
+[simplescrollbars addon](http://codemirror.net/doc/manual.html#addon_simplescrollbars): Fix invalid state when deleting at end of document.
+
+[clike mode](http://codemirror.net/mode/clike/index.html): No longer gets confused when a comment starts after an operator.
+
+[markdown mode](http://codemirror.net/mode/markdown/index.html): Now supports CommonMark-style flexible list indentation.
+
+[dylan mode](http://codemirror.net/mode/dylan/index.html): Several improvements and fixes.
+
## 5.12.0 (2016-02-19)
### New features
diff --git a/doc/compress.html b/doc/compress.html
index 302890c4778dd9956797193deec9f30387cc9d65..a0d4364a3e3b2bce49783f4de0840c28d85e9e1d 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=5.13.0;f=">5.13</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.12.0;f=">5.12</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.11.0;f=">5.11</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.10.0;f=">5.10</option>
diff --git a/doc/manual.html b/doc/manual.html
index 82687528f50e7f6c0ef11be0bc3f975ce6a8947c..f5cb235d1a5ed6213a034acf0b97c983d74f0a6e 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.12.1</span>
+ <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.13.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 a8e15ac059fc97108341d4608c870f04847951c4..f99334d2542f0fda1402d19dfc76ecb05dd471f6 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,9 +30,26 @@
<h2>Version 5.x</h2>
+ <p class="rel">21-03-2016: <a href="http://codemirror.net/codemirror-5.13.zip">Version 5.13</a>:</p>
+
+ <ul class="rel-note">
+ <li>New DOM event forwarded: <a href="http://codemirror.net/doc/manual.html#event_dom"><code>"dragleave"</code></a>.</li>
+ <li><a href="http://codemirror.net/mode/protobuf/index.html">protobuf mode</a>: Newly added.</li>
+ <li>Fix problem where <a href="http://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a> sometimes failed to find multi-line marks.</li>
+ <li>Fix crash that showed up when atomic ranges and bidi text were combined.</li>
+ <li><a href="http://codemirror.net/demo/complete.html">show-hint addon</a>: Completion widgets no longer close when the line indented or dedented.</li>
+ <li><a href="http://codemirror.net/demo/merge.html">merge addon</a>: Fix bug when merging chunks at the end of the file.</li>
+ <li><a href="http://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: No longer gets confused by <a href="http://codemirror.net/doc/manual.html#swapDoc"><code>swapDoc</code></a>.</li>
+ <li><a href="http://codemirror.net/doc/manual.html#addon_simplescrollbars">simplescrollbars addon</a>: Fix invalid state when deleting at end of document.</li>
+ <li><a href="http://codemirror.net/mode/clike/index.html">clike mode</a>: No longer gets confused when a comment starts after an operator.</li>
+ <li><a href="http://codemirror.net/mode/markdown/index.html">markdown mode</a>: Now supports CommonMark-style flexible list indentation.</li>
+ <li><a href="http://codemirror.net/mode/dylan/index.html">dylan mode</a>: Several improvements and fixes.</li>
+ <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.12.0...5.13.0">list of patches</a></li>
+ </ul>
+
<p class="rel">19-02-2016: <a href="http://codemirror.net/codemirror-5.12.zip">Version 5.12</a>:</p>
- <ul>
+ <ul class="rel-note">
<li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: Ctrl-Q is now an alias for Ctrl-V.</li>
<li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: The Vim API now exposes an <code>unmap</code> method to unmap bindings.</li>
<li><a href="http://codemirror.net/demo/activeline.html">active-line addon</a>: This addon can now style the active line's gutter.</li>
@@ -55,7 +72,7 @@
<p class="rel">20-01-2016: <a href="http://codemirror.net/codemirror-5.11.zip">Version 5.11</a>:</p>
- <ul>
+ <ul class="rel-note">
<li>New modes: <a href="../mode/jsx/index.html">JSX</a>, <a href="../mode/haskell-literate/index.html">literate Haskell</a></li>
<li>The editor now forwards more <a href="manual.html#event_dom">DOM events</a>: <code>cut</code>, <code>copy</code>, <code>paste</code>, and <code>touchstart</code>. It will also forward <code>mousedown</code> for drag events</li>
<li>Fixes a bug where bookmarks next to collapsed spans were not rendered</li>
diff --git a/index.html b/index.html
index 1762598d8d8de0181230bffb246398c9a2fc666d..a136e0b16756621de2f3460da584dc6ba618f2df 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@
</div>
</div>
<div class=actionsleft>
- Get the current version: <a href="http://codemirror.net/codemirror.zip">5.12</a>.<br>
+ Get the current version: <a href="http://codemirror.net/codemirror.zip">5.13</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>.
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c736708ee41bddf7a1aa67126fb4b20be7f2187a..4779d12de40086630edc39e26ca6145d3e886659 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8893,7 +8893,7 @@
// THE END
- CodeMirror.version = "5.12.1";
+ CodeMirror.version = "5.13.0";
return CodeMirror;
});
diff --git a/package.json b/package.json
index 1b4f32e523b7e59e4277faef9ef3f08f51b8d118..71ddfae935f69a3787d112cdc17b0ba5d8603b7d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "codemirror",
- "version":"5.12.1",
+ "version":"5.13.0",
"main": "lib/codemirror.js",
"description": "In-browser code editing made bearable",
"license": "MIT",