# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1584169207 -3600
# Node ID d2153928b376d1a718d46408ce2d5da63db7c010
# Parent  e9bfd6b3a4781215ad3aab528199b37214ebbde5
patch 8.2.0379: gcc warns for ambiguous else

Commit: https://github.com/vim/vim/commit/965fd8d4dc5e84f612d8fc1efeaa78bd17842c9b
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Mar 14 07:46:40 2020 +0100

    patch 8.2.0379: gcc warns for ambiguous else

    Problem:    Gcc warns for ambiguous else.
    Solution:   Add braces. (Dominique Pelle, closes https://github.com/vim/vim/issues/5778)

diff --git a/src/textprop.c b/src/textprop.c
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -664,6 +664,7 @@ f_prop_find(typval_T *argvars, typval_T 
 			    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 
 		}
 		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
--- 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,