summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-09-01 19:50:09 +0200
committerBram Moolenaar <Bram@vim.org>2015-09-01 19:50:09 +0200
commit544780248b5876339b316703fc2f330a9d316c45 (patch)
treec3041cd8445e92f1dcf81f229d9ea5107d17c31d
parent8b5f65a527c353b9942e362e719687c3a7592309 (diff)
patch 7.4.850v7.4.850
Problem: <Esc> does not show up. Solution: Use &gt; and &lt;. (Kazunobu Kuriyama)
-rw-r--r--CONTRIBUTING.md5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8fb88c72fd..af39302c0b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,8 +27,9 @@ maillist. Try reproducing the problem without any plugins or settings:
If you report an issue, please describe exactly how to reproduce it.
For example, don't say "insert some text" but say what you did exactly:
-"ahere is some text<Esc>". Ideally, the steps you list can be used to write a
-test to verify the problem is fixed.
+"ahere is some text&lt;Esc&gt;".
+Ideally, the steps you list can be used to write a test to verify the problem
+is fixed.
Feel free to report even the smallest problem, also typos in the documentation.
diff --git a/src/version.c b/src/version.c
index eac1f1b173..f09e4f3d4e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 850,
+/**/
849,
/**/
848,