# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1586005203 -7200
# Node ID 473ceb7f65e2dad2c083ed86ba7a4002da0558b1
# Parent  24ec859a2130b2ae2ecd1d9d9f737a0c9f19da7e
patch 8.2.0510: Coverity complains about using uninitialized variable

Commit: https://github.com/vim/vim/commit/8d4ed11da635a1abe0ef2d795b4d48824c54d0e7
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Apr 4 14:50:32 2020 +0200

    patch 8.2.0510: Coverity complains about using uninitialized variable

    Problem:    Coverity complains about using uninitialized variable.
    Solution:   Assign a value to "scol".  Move code inside NULL check.

diff --git a/src/beval.c b/src/beval.c
--- a/src/beval.c
+++ b/src/beval.c
@@ -110,6 +110,8 @@ find_word_under_cursor(
 			lbuf = vim_strnsave(lbuf, len);
 		    }
 		}
+		else
+		    scol = col;
 
 		if (winp != NULL)
 		    *winp = wp;
diff --git a/src/popupwin.c b/src/popupwin.c
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -798,16 +798,16 @@ apply_general_options(win_T *wp, dict_T 
 		    if (*str != NUL)
 			wp->w_border_char[i] = mb_ptr2char(str);
 		}
-	    }
-	    if (list->lv_len == 1)
-		for (i = 1; i < 8; ++i)
-		    wp->w_border_char[i] = wp->w_border_char[0];
-	    if (list->lv_len == 2)
-	    {
-		for (i = 4; i < 8; ++i)
-		    wp->w_border_char[i] = wp->w_border_char[1];
-		for (i = 1; i < 4; ++i)
-		    wp->w_border_char[i] = wp->w_border_char[0];
+		if (list->lv_len == 1)
+		    for (i = 1; i < 8; ++i)
+			wp->w_border_char[i] = wp->w_border_char[0];
+		if (list->lv_len == 2)
+		{
+		    for (i = 4; i < 8; ++i)
+			wp->w_border_char[i] = wp->w_border_char[1];
+		    for (i = 1; i < 4; ++i)
+			wp->w_border_char[i] = wp->w_border_char[0];
+		}
 	    }
 	}
     }
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 */
 /**/
+    510,
+/**/
     509,
 /**/
     508,