aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2015-03-22 21:17:35 +0100
committerBjörn Linse <bjorn.linse@gmail.com>2015-03-22 21:17:35 +0100
commit1257b303ac678fa425d4a1522fe12cbdc7ebf3ec (patch)
tree9cb6bc3fd2240babf9d9aab06cfb5b864d5ac8ca /src
parent4bc62c76c70b86400f60d6c7de98d271b664bec2 (diff)
parent04c8235df084d915e30600746ccde83f36cebcfb (diff)
downloadrneovim-1257b303ac678fa425d4a1522fe12cbdc7ebf3ec.tar.gz
rneovim-1257b303ac678fa425d4a1522fe12cbdc7ebf3ec.tar.bz2
rneovim-1257b303ac678fa425d4a1522fe12cbdc7ebf3ec.zip
Merge pull request #2212 from bfredl/concealfix
fix missing conceal cchar when it is the first syntax group shown
Diffstat (limited to 'src')
-rw-r--r--src/nvim/syntax.c2
-rw-r--r--src/nvim/version.c11
2 files changed, 12 insertions, 1 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 3f9466fd7c..0da79cb8ae 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -319,7 +319,7 @@ static char msg_no_items[] = N_("No Syntax items defined for this buffer");
#define ID_LIST_ALL (short *)-1 /* valid of si_cont_list for containing all
but contained groups */
-static int next_seqnr = 0; /* value to use for si_seqnr */
+static int next_seqnr = 1; /* value to use for si_seqnr */
/*
* The next possible match in the current line for any pattern is remembered,
diff --git a/src/nvim/version.c b/src/nvim/version.c
index a957d844be..8045044d6a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -178,6 +178,17 @@ static char *(features[]) = {
// clang-format off
static int included_patches[] = {
+ 673,
+ //672,
+ //671,
+ //670,
+ //669,
+ //668,
+ //667,
+ //666,
+ //665,
+ //664,
+ //663,
//662,
//661,
660,