From 6bd09fcc278ed625d8478177e3a284e91d0b8695 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jun 2016 11:57:58 +0200
Subject: [PATCH] Mark version 5.16.0

---
 AUTHORS           |  5 +++++
 CHANGELOG.md      | 20 ++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5e373a0202..ce2be8d6d2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,6 +14,7 @@ Ahmad Amireh
 Ahmad M. Zawawi
 ahoward
 Akeksandr Motsjonov
+Alasdair Smith
 Alberto González Palomo
 Alberto Pose
 Albert Xing
@@ -140,6 +141,7 @@ Darius Roberts
 Dave Brondsema
 Dave Myers
 David Barnett
+David H. Bronke
 David Mignot
 David Pathakjee
 David Vázquez
@@ -213,6 +215,7 @@ Gustavo Rodrigues
 Hakan Tunc
 Hans Engel
 Hardest
+Harshvardhan Gupta
 Hasan Karahan
 Hector Oswaldo Caballero
 Herculano Campos
@@ -258,6 +261,7 @@ Jason Siefken
 Jaydeep Solanki
 Jean Boussier
 Jeff Blaisdell
+Jeff Jenkins
 jeffkenton
 Jeff Pickhardt
 jem (graphite)
@@ -479,6 +483,7 @@ Ruslan Osmanov
 Ryan Prior
 sabaca
 Samuel Ainsworth
+Sam Wilson
 sandeepshetty
 Sander AKA Redsandro
 santec
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 146af30edd..a34cf82ffa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.16.0 (2016-06-20)
+
+### Bugfixes
+
+Fix glitches when dragging content caused by the drop indicator receiving mouse events.
+
+Make Control-drag work on Firefox.
+
+Make clicking or selection-dragging at the end of a wrapped line select the right position.
+
+[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Prevent widget scrollbar from hiding part of the hint text.
+
+[rulers addon](http://codemirror.net/doc/manual.html#addon_rulers): Prevent rulers from forcing a horizontal editor scrollbar.
+
+### New features
+
+[search addon](http://codemirror.net/doc/manual.html#addon_search): Automatically bind search-related keys in persistent dialog.
+
+[sublime keymap](http://codemirror.net/demo/sublime.html): Add a multi-cursor aware smart backspace binding.
+
 ## 5.15.2 (2016-05-20)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index fe27e025cc..b890bee021 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.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>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.0;f=">5.15.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.2;f=">5.14.2</option>
diff --git a/doc/manual.html b/doc/manual.html
index 8c39e7f941..55b22efd65 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.15.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.16.0</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/index.html b/index.html
index e987926921..528b3a430a 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">5.15.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.16.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 7fd38c976e..7dc842d3ba 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8916,7 +8916,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.15.3";
+  CodeMirror.version = "5.16.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index d4dd2b00ef..5638b12a1f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.15.3",
+    "version":"5.16.0",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",