summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-14 07:46:40 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-14 07:46:40 +0100
commit965fd8d4dc5e84f612d8fc1efeaa78bd17842c9b (patch)
treeaa5832426f7134ef1e970c72cc0342a8374f1509
parent346f18e5fe12e6aaba5a6a18f6d0deb55eb7a9e8 (diff)
downloadvim-git-965fd8d4dc5e84f612d8fc1efeaa78bd17842c9b.tar.gz
patch 8.2.0379: gcc warns for ambiguous elsev8.2.0379
Problem: Gcc warns for ambiguous else. Solution: Add braces. (Dominique Pelle, closes #5778)
-rw-r--r--src/textprop.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/textprop.c b/src/textprop.c
index 6e3ed5f7b..580c3e7a9 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -664,6 +664,7 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
sizeof(textprop_T));
if (lnum == lnum_start)
+ {
if (dir < 0)
{
if (col < prop.tp_col)
@@ -671,7 +672,7 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
}
else if (prop.tp_col + prop.tp_len - (prop.tp_len != 0) < col)
continue;
-
+ }
if (prop.tp_id == id || prop.tp_type == type_id)
{
// Check if the starting position has text props.
diff --git a/src/version.c b/src/version.c
index 303f7eca5..75baad19a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 379,
+/**/
378,
/**/
377,