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.

src/beval.c

@@ -110,6 +110,8 @@ find_word_under_cursor(
 			lbuf = vim_strnsave(lbuf, len);
 		    }
 		}
+		else
+		    scol = col;
 
 		if (winp != NULL)
 		    *winp = wp;

src/popupwin.c

@@ -798,7 +798,6 @@ apply_general_options(win_T *wp, dict_T *dict)
 		    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];
@@ -811,6 +810,7 @@ apply_general_options(win_T *wp, dict_T *dict)
 		}
 	    }
 	}
+    }
 
     check_highlight(dict, "scrollbarhighlight", &wp->w_scrollbar_highlight);
     check_highlight(dict, "thumbhighlight", &wp->w_thumb_highlight);

src/version.c

@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    510,
 /**/
     509,
 /**/