From a66bcf59d959b2ef724f80080f8d128d9dcf318e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 May 2017 10:13:00 +0200
Subject: [PATCH] Mark version 5.26.0
---
AUTHORS | 8 ++++++++
CHANGELOG.md | 22 ++++++++++++++++++++++
doc/manual.html | 2 +-
doc/releases.html | 13 +++++++++++++
index.html | 2 +-
package.json | 2 +-
src/edit/main.js | 2 +-
7 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 2ac995f9..ed1cfe1c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -70,6 +70,7 @@ Apollo Zhu
AQNOUCH Mohammed
areos
Arnab Bose
+Arsène von Wyss
Arthur Müller
Arun Narasani
as3boyan
@@ -259,6 +260,7 @@ Irakli Gozalishvili
Ivan Kurnosov
Ivoah
Jacob Lee
+Jaimin
Jake Peyser
Jakob Miland
Jakub Vrana
@@ -454,6 +456,7 @@ Narciso Jaramillo
Nathan Williams
ndr
nerbert
+NetworkNode
nextrevision
ngn
nguillaumin
@@ -473,6 +476,7 @@ Nisarg Jhaveri
nlwillia
noragrossman
Norman Rzepka
+opl-
Oreoluwa Onatemowo
Oskar Segersvärd
pablo
@@ -515,6 +519,7 @@ Randall Mason
Randy Burden
Randy Edmunds
Rasmus Erik Voel Jensen
+Rasmus Schultz
ray ratchup
Ray Ratchup
Remi Nyborg
@@ -523,6 +528,7 @@ Richard Denton
Richard van der Meer
Richard Z.H. Wang
Rishi Goomar
+Robert Brignull
Robert Crossfield
Roberto Abdelkader MartÃnez Pérez
robertop23
@@ -534,6 +540,7 @@ Ryan Petrello
Ryan Prior
sabaca
Sam Lee
+Sam Rawlins
Samuel Ainsworth
Sam Wilson
sandeepshetty
@@ -558,6 +565,7 @@ shaun gilchrist
Shawn A
Shea Bunge
sheopory
+Shil S
Shiv Deepak
Shmuel Englard
Shubham Jain
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa356a01..5dd793cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 5.26.0 (2017-05-22)
+
+### Bug fixes
+
+In textarea-mode, don't reset the input field during composition.
+
+More careful restoration of selections in widgets, during editor redraw.
+
+[javascript mode](http://codemirror.net/mode/javascript/): More TypeScript parsing fixes.
+
+[julia mode](http://codemirror.net/mode/julia/): Fix issue where the mode gets stuck.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Understand cross-line links, parse all bracketed things as links.
+
+[soy mode](http://codemirror.net/mode/soy/): Support single-quoted strings.
+
+[go mode](http://codemirror.net/mode/go/): Don't try to indent inside strings or comments.
+
+### New features
+
+[vim bindings](http://codemirror.net/mode/demo/vim.html): Parse line offsets in line or range specs.
+
## 5.25.2 (2017-04-20)
### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 3c1d2fe0..aa153d47 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.25.3</span>
+ <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.26.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 ac4a58b6..a57a964a 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@
<h2>Version 5.x</h2>
+ <p class="rel">22-05-2017: <a href="http://codemirror.net/codemirror-5.26.0.zip">Version 5.26.0</a>:</p>
+
+ <ul class="rel-note">
+ <li>In textarea-mode, don't reset the input field during composition.</li>
+ <li>More careful restoration of selections in widgets, during editor redraw.</li>
+ <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Parse line offsets in line or range specs.</li>
+ <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: More TypeScript parsing fixes.</li>
+ <li><a href="http://codemirror.net/mode/julia/">julia mode</a>: Fix issue where the mode gets stuck.</li>
+ <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Understand cross-line links, parse all bracketed things as links.</li>
+ <li><a href="http://codemirror.net/mode/soy/">soy mode</a>: Support single-quoted strings.</li>
+ <li><a href="http://codemirror.net/mode/go/">go mode</a>: Don't try to indent inside strings or comments.</li>
+ </ul>
+
<p class="rel">20-04-2017: <a href="http://codemirror.net/codemirror-5.25.2.zip">Version 5.25.2</a>:</p>
<ul class="rel-note">
diff --git a/index.html b/index.html
index 527eb8ad..49a7aa08 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.25.2</a>.<br>
+ Get the current version: <a href="http://codemirror.net/codemirror.zip">5.26.0</a>.<br>
You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
read the <a href="doc/releases.html">release notes</a>,<br>
or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index dbff5cbd..da5322f3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "codemirror",
- "version": "5.25.3",
+ "version": "5.26.0",
"main": "lib/codemirror.js",
"description": "Full-featured in-browser code editor",
"license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index e9dd8b8a..f7f55885 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
addLegacyProps(CodeMirror)
-CodeMirror.version = "5.25.3"
+CodeMirror.version = "5.26.0"
--
GitLab