From 83483ef884d43264e682357e3cb6e6d652d96c65 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 11:41:40 +0200
Subject: [PATCH] Mark release 5.14.0

---
 AUTHORS           | 14 ++++++++++++++
 CHANGELOG.md      | 30 ++++++++++++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 18 ++++++++++++++++++
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2c8a9bf3d..f64cb6d10 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,6 +45,7 @@ Andre von Houck
 Andrey Fedorov
 Andrey Klyuchnikov
 Andrey Lushnikov
+Andrey Shchekin
 Andy Joslin
 Andy Kimball
 Andy Li
@@ -75,9 +76,11 @@ benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
+Ben Miller
 Ben Mosher
 Bernhard Sirlinger
 Bert Chang
+Bharad
 Billy Moon
 binny
 B Krishna Chaitanya
@@ -183,6 +186,7 @@ Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
 galambalazs
+Gary Sheng
 Gautam Mehta
 Gavin Douglas
 gekkoe
@@ -199,6 +203,7 @@ Gordon Smith
 Grant Skinner
 greengiant
 Gregory Koberger
+Grzegorz Mazur
 Guillaume Massé
 Guillaume Massé
 guraga
@@ -230,6 +235,7 @@ Jakob Miland
 Jakub Vrana
 Jakub Vrána
 James Campos
+James Howard
 James Thorne
 Jamie Hill
 Jan Jongboom
@@ -257,6 +263,7 @@ Jim
 JobJob
 jochenberger
 Jochen Berger
+joelpinheiro
 Johan Ask
 John Connor
 John Engler
@@ -272,6 +279,7 @@ Jon Sangster
 Joost-Wim Boekesteijn
 Joseph Pecoraro
 Josh Cohen
+Josh Soref
 Joshua Newman
 Josh Watzman
 jots
@@ -298,6 +306,7 @@ Koh Zi Han, Cliff
 komakino
 Konstantin Lopuhin
 koops
+Kris Ciccarello
 ks-ifware
 kubelsmieci
 KwanEsq
@@ -315,6 +324,7 @@ LM
 lochel
 Lorenzo Stoakes
 Luciano Longo
+Lu Fangjian
 Luke Stagner
 lynschinzer
 M1cha
@@ -322,6 +332,7 @@ Madhura Jayaratne
 Maksim Lin
 Maksym Taran
 Malay Majithia
+Manideep
 Manuel Rego Casasnovas
 Marat Dreizin
 Marcel Gerber
@@ -476,6 +487,7 @@ Scott Aikin
 Scott Goodhew
 Sebastian Zaha
 Sergey Goder
+Sergey Tselovalnikov
 Se-Won Kim
 shaund
 shaun gilchrist
@@ -520,6 +532,7 @@ Thomas Schmid
 Tim Alby
 Tim Baumann
 Timothy Farrell
+Timothy Gu
 Timothy Hatcher
 TobiasBg
 Tomas-A
@@ -532,6 +545,7 @@ Triangle717
 Tristan Tarrant
 TSUYUSATO Kitsune
 twifkak
+VapidWorx
 Vestimir Markov
 vf
 Victor Bocharsky
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0a6ab57f..d6e39cce9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 5.14.0 (2016-04-20)
+
+### Bugfixes
+
+[`posFromIndex`](http://codemirror.net/doc/manual.html#posFromIndex) and [`indexFromPos`](http://codemirror.net/doc/manual.html#indexFromPos) now take [`lineSeparator`](http://codemirror.net/doc/manual.html#option_lineSeparator) into account.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Only call `.save()` when it is actually available.
+
+[commend addon](http://codemirror.net/doc/manual.html#addon_comment): Be careful not to mangle multi-line strings.
+
+[Python mode](http://codemirror.net/mode/python/index.html): Improve distinguishing of decorators from `@` operators.
+
+[`findMarks`](http://codemirror.net/doc/manual.html#findMarks): No longer return marks that touch but don't overlap given range.
+
+### New features
+
+[vim bindings](http://codemirror.net/demo/vim.html): Add yank command.
+
+[match-highlighter addon](http://codemirror.net/doc/manual.html#addon_match-highlighter): Add `trim` option to disable ignoring of whitespace.
+
+[PowerShell mode](http://codemirror.net/mode/powershell/index.html): Added.
+
+[Yacas mode](http://codemirror.net/mode/yacas/index.html): Added.
+
+[Web IDL mode](http://codemirror.net/mode/webidl/index.html): Added.
+
+[SAS mode](http://codemirror.net/mode/sas/index.html): Added.
+
+[mbox mode](http://codemirror.net/mode/mbox/index.html): Added.
+
 ## 5.13.2 (2016-03-23)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 4459f46ed..1e507c6c7 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.14.0;f=">5.14</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.2;f=">5.13</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>
diff --git a/doc/manual.html b/doc/manual.html
index 5f3b2330b..19c60b33a 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.13.5</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.14.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 99306b91c..5e6a2b2b0 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,24 @@
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2016: <a href="http://codemirror.net/codemirror-5.14.0.zip">Version 5.14.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="http://codemirror.net/doc/manual.html#posFromIndex"><code>posFromIndex</code></a> and <a href="http://codemirror.net/doc/manual.html#indexFromPos"><code>indexFromPos</code></a> now take <a href="http://codemirror.net/doc/manual.html#option_lineSeparator"><code>lineSeparator</code></a> into account</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Only call <code>.save()</code> when it is actually available</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">commend addon</a>: Be careful not to mangle multi-line strings</li>
+    <li><a href="http://codemirror.net/mode/python/index.html">Python mode</a>: Improve distinguishing of decorators from <code>@</code> operators</li>
+    <li><a href="http://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a>: No longer return marks that touch but don't overlap given range</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Add yank command</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Add <code>trim</code> option to disable ignoring of whitespace</li>
+    <li><a href="http://codemirror.net/mode/powershell/index.html">PowerShell mode</a>: Added</li>
+    <li><a href="http://codemirror.net/mode/yacas/index.html">Yacas mode</a>: Added</li>
+    <li><a href="http://codemirror.net/mode/webidl/index.html">Web IDL mode</a>: Added</li>
+    <li><a href="http://codemirror.net/mode/sas/index.html">SAS mode</a>: Added</li>
+    <li><a href="http://codemirror.net/mode/mbox/index.html">mbox mode</a>: Added</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.13.4...5.14.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">21-03-2016: <a href="http://codemirror.net/codemirror-5.13.2.zip">Version 5.13.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6b9b71c70..94de3279d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8891,7 +8891,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.13.5";
+  CodeMirror.version = "5.14.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index ca0d787e4..544fd86f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.13.5",
+    "version":"5.14.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",
-- 
GitLab