From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 12 Jul 2015 14:21:23 +0000 (+0200)
Subject: patch 7.4.780
X-Git-Tag: v7.4.780
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1db43b1145fe466b5d41af6744a08083983de3a9;p=vim

patch 7.4.780
Problem:    Compiler complains about uninitialized variable and clobbered
            variables.
Solution:   Add Initialization.  Make variables static.
---

diff --git a/src/main.c b/src/main.c
index abcf0c974..096652fad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1069,9 +1069,10 @@ main_loop(cmdwin, noexmode)
     oparg_T	oa;				/* operator arguments */
     volatile int previous_got_int = FALSE;	/* "got_int" was TRUE */
 #ifdef FEAT_CONCEAL
-    linenr_T	conceal_old_cursor_line = 0;
-    linenr_T	conceal_new_cursor_line = 0;
-    int		conceal_update_lines = FALSE;
+    /* these are static to avoid a compiler warning */
+    static linenr_T	conceal_old_cursor_line = 0;
+    static linenr_T	conceal_new_cursor_line = 0;
+    static int		conceal_update_lines = FALSE;
 #endif
 
 #if defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)
diff --git a/src/ops.c b/src/ops.c
index e88205171..671c92b4f 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5403,7 +5403,7 @@ do_addsub(command, Prenum1, g_cmd)
     int		i;
     int		lnum = curwin->w_cursor.lnum;
     int		lnume = curwin->w_cursor.lnum;
-    int		startcol;
+    int		startcol = 0;
     int		did_change = FALSE;
 
     dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL);	/* "heX" */
diff --git a/src/version.c b/src/version.c
index f90e50930..c9691dd81 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    780,
 /**/
     779,
 /**/