changeset 19644:d2153928b376 v8.2.0379

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)
author Bram Moolenaar <Bram@vim.org>
date Sat, 14 Mar 2020 08:00:07 +0100
parents e9bfd6b3a478
children c4e27eead327
files src/textprop.c src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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,