]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
updated for version 7.4.628 v7.4.628
authorBram Moolenaar <Bram@vim.org>
Tue, 10 Feb 2015 18:27:05 +0000 (19:27 +0100)
committerBram Moolenaar <Bram@vim.org>
Tue, 10 Feb 2015 18:27:05 +0000 (19:27 +0100)
Problem:    Compiler warning for variable might be clobbered by longjmp.
Solution:   Add volatile. (Michael Jarvis)

src/main.c
src/version.c

index ec83d8f14980e077822471eb6a51a97c38a42df3..885192beddfc550cb578d37d65608b1ec04fc5b7 100644 (file)
@@ -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;
index 9a813d7ba15d6fcd37de29b74052552c9d793dde..ce0b57bf347ece0fd663cc8e67151aa49b8c9285 100644 (file)
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    628,
 /**/
     627,
 /**/