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 6e3ed5f7be80ffd32dd47e74b2a95b3bc32efadb..580c3e7a97e3f49a5d4e695b8118e253ebf8de51 100644 (file)
--- 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 303f7eca59507e7fa16886e896d540c56ef249d1..75baad19a713e11d628b60666419cf0bfa614875 100644 (file)
--- 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,
 /**/