thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.4851: compiler warning for uninitialized variable

Browse Source 
Problem:    Compiler warning for uninitialized variable.
Solution:   Use another variable to decide to restore option values.
This commit is contained in:
Bram Moolenaar
2022-05-01 00:42:24 +01:00
parent d7c9564d8d
commit b4011afe53
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/session.c
View File

@@ -620,6 +620,7 @@ makeopens(
int only_save_windows = TRUE; int only_save_windows = TRUE;
int nr; int nr;
int restore_size = TRUE; int restore_size = TRUE;
int restore_height_width = FALSE;
win_T *wp; win_T *wp;
char_u *sname; char_u *sname;
win_T *edited_win = NULL; win_T *edited_win = NULL;
@@ -887,6 +888,7 @@ makeopens(
|| put_line(fd, "set winminwidth=0") == FAIL || put_line(fd, "set winminwidth=0") == FAIL
|| put_line(fd, "set winwidth=1") == FAIL) || put_line(fd, "set winwidth=1") == FAIL)
goto fail; goto fail;
restore_height_width = TRUE;
} }
if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL) if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL)
goto fail; goto fail;
@@ -979,7 +981,7 @@ makeopens(
goto fail; goto fail;
} }
if (tab_firstwin->w_next != NULL) if (restore_height_width)
{ {
// Restore 'winminheight' and 'winminwidth'. // Restore 'winminheight' and 'winminwidth'.
if (put_line(fd, "let &winminheight = s:save_winminheight") == FAIL if (put_line(fd, "let &winminheight = s:save_winminheight") == FAIL

2
src/version.c
View File

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