From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 14 Mar 2020 06:46:40 +0000 (+0100)
Subject: patch 8.2.0379: gcc warns for ambiguous else
X-Git-Tag: v8.2.0379
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=965fd8d4dc5e84f612d8fc1efeaa78bd17842c9b;p=vim

patch 8.2.0379: gcc warns for ambiguous else

Problem:    Gcc warns for ambiguous else.
Solution:   Add braces. (Dominique Pelle, closes #5778)
---

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
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    379,
 /**/
     378,
 /**/