From 751fd52c3e16f10739a0df54769b8b44a836b35b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 Aug 2016 15:45:37 +0200
Subject: [PATCH] Mark release 5.18.0
---
AUTHORS | 5 +++++
CHANGELOG.md | 28 ++++++++++++++++++++++++++++
doc/compress.html | 1 +
doc/manual.html | 2 +-
doc/releases.html | 15 +++++++++++++++
index.html | 2 +-
lib/codemirror.js | 2 +-
package.json | 2 +-
8 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 6a96b87c0..0f2bc1bbf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -98,6 +98,7 @@ Brian Sletten
Bruce Mitchener
Caitlin Potter
Calin Barbat
+callodacity
Camilo Roca
Chad Jolly
Chandra Sekhar Pydi
@@ -180,6 +181,7 @@ feizhang365
Felipe Lalanne
Felix Raab
Filip Noetzel
+Filip Stollár
flack
ForbesLindesay
Forbes Lindesay
@@ -271,6 +273,7 @@ Jim
JobJob
jochenberger
Jochen Berger
+Joel Einbinder
joelpinheiro
Johan Ask
John Connor
@@ -485,6 +488,7 @@ Rrandom
Ruslan Osmanov
Ryan Prior
sabaca
+Sam Lee
Samuel Ainsworth
Sam Wilson
sandeepshetty
@@ -542,6 +546,7 @@ thanasis
TheHowl
think
Thomas Dvornik
+Thomas Kluyver
Thomas Schmid
Tim Alby
Tim Baumann
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55ace8ffa..5e1973fbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 5.18.0 (2016-08-22)
+
+### Bugfixes
+
+Make sure [gutter backgrounds](http://codemirror.net/doc/manual.html#addLineClass) stick to the rest of the gutter during horizontal scrolling.
+
+The contenteditable [`inputStyle`](http://codemirror.net/doc/manual.html#option_inputStyle) now properly supports pasting on pre-Edge IE versions.
+
+[javascript mode](http://codemirror.net/mode/javascript): Fix some small parsing bugs and improve TypeScript support.
+
+[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Fix bug where active highlighting was left in editor when the addon was disabled.
+
+[match-highlighter addon](http://codemirror.net/doc/manual.html#addon_match-highlighter): Only start highlighting things when the editor gains focus.
+
+[javascript-hint addon](http://codemirror.net/doc/manual.html#addon_javascript-hint): Also complete non-enumerable properties.
+
+### New features
+
+The [`addOverlay`](http://codemirror.net/doc/manual.html#addOverlay) method now supports a `priority` option to control the order in which overlays are applied.
+
+MIME types that end in `+json` now default to the JSON mode when the MIME itself is not defined.
+
+### Breaking changes
+
+The mode formerly known as Jade was renamed to [Pug](http://codemirror.net/mode/pug).
+
+The [Python mode](http://codemirror.net/mode/python) now defaults to Python 3 (rather than 2) syntax.
+
## 5.17.0 (2016-07-19)
### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 3487d75e5..1cded19a7 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.18.0;f=">5.18.0</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.17.0;f=">5.17.0</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.16.0;f=">5.16.0</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.2;f=">5.15.2</option>
diff --git a/doc/manual.html b/doc/manual.html
index 40892d92e..9d5c7b9cd 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.17.1</span>
+ <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.18.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 17ec88a96..9a615030e 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,21 @@
<h2>Version 5.x</h2>
+ <p class="rel">22-08-2016: <a href="http://codemirror.net/codemirror-5.18.0.zip">Version 5.18.0</a>:</p>
+
+ <ul class=rel-note>
+ <li>Make sure <a href="http://codemirror.net/doc/manual.html#addLineClass">gutter backgrounds</a> stick to the rest of the gutter during horizontal scrolling.</li>
+ <li>The contenteditable <a href="http://codemirror.net/doc/manual.html#option_inputStyle"><code>inputStyle</code></a> now properly supports pasting on pre-Edge IE versions.</li>
+ <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Fix some small parsing bugs and improve TypeScript support.</li>
+ <li><a href="http://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix bug where active highlighting was left in editor when the addon was disabled.</li>
+ <li><a href="http://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Only start highlighting things when the editor gains focus.</li>
+ <li><a href="http://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Also complete non-enumerable properties.</li>
+ <li>The <a href="http://codemirror.net/doc/manual.html#addOverlay"><code>addOverlay</code></a> method now supports a <code>priority</code> option to control the order in which overlays are applied.</li>
+ <li>MIME types that end in <code>+json</code> now default to the JSON mode when the MIME itself is not defined.</li>
+ <li>The mode formerly known as Jade was renamed to <a href="http://codemirror.net/mode/pug">Pug</a>.</li>
+ <li>The <a href="http://codemirror.net/mode/python">Python mode</a> now defaults to Python 3 (rather than 2) syntax.</li>
+ </ul>
+
<p class="rel">19-07-2016: <a href="http://codemirror.net/codemirror-5.17.0.zip">Version 5.17.0</a>:</p>
<ul class="rel-note">
diff --git a/index.html b/index.html
index 8860f8b4e..ab03ca752 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.17.0</a>.<br>
+ Get the current version: <a href="http://codemirror.net/codemirror.zip">5.18.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>.
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 58c45f457..68b4e953f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8955,7 +8955,7 @@
// THE END
- CodeMirror.version = "5.17.1";
+ CodeMirror.version = "5.18.0";
return CodeMirror;
});
diff --git a/package.json b/package.json
index 135a9608c..5f02281f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "codemirror",
- "version":"5.17.1",
+ "version":"5.18.0",
"main": "lib/codemirror.js",
"description": "Full-featured in-browser code editor",
"license": "MIT",
--
GitLab