From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 10 Feb 2015 18:27:05 +0000 (+0100)
Subject: updated for version 7.4.628
X-Git-Tag: v7.4.628
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8872ef1b4e1b304cc168ea4c8f68645498c155be;p=thirdparty%2Fvim.git

updated for version 7.4.628
Problem:    Compiler warning for variable might be clobbered by longjmp.
Solution:   Add volatile. (Michael Jarvis)
---

diff --git a/src/main.c b/src/main.c
index ec83d8f149..885192bedd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1051,7 +1051,7 @@ main_loop(cmdwin, noexmode)
     int		noexmode;   /* TRUE when return on entering Ex mode */
 {
     oparg_T	oa;				/* operator arguments */
-    int		previous_got_int = FALSE;	/* "got_int" was TRUE */
+    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;
diff --git a/src/version.c b/src/version.c
index 9a813d7ba1..ce0b57bf34 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 */
+/**/
+    628,
 /**/
     627,
 /**/