mirror of
https://github.com/neovim/neovim.git
synced 2025-10-21 17:21:49 +00:00
vim-patch:8.2.4851: compiler warning for uninitialized variable
Problem: Compiler warning for uninitialized variable.
Solution: Use another variable to decide to restore option values.
b4011afe53
Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
@@ -710,6 +710,7 @@ static int makeopens(FILE *fd, char *dirnow)
|
|||||||
|
|
||||||
// Assume "tabpages" is in 'sessionoptions'. If not then we only do
|
// Assume "tabpages" is in 'sessionoptions'. If not then we only do
|
||||||
// "curtab" and bail out of the loop.
|
// "curtab" and bail out of the loop.
|
||||||
|
bool restore_height_width = false;
|
||||||
FOR_ALL_TABS(tp) {
|
FOR_ALL_TABS(tp) {
|
||||||
bool need_tabnext = false;
|
bool need_tabnext = false;
|
||||||
int cnr = 1;
|
int cnr = 1;
|
||||||
@@ -810,6 +811,7 @@ static int makeopens(FILE *fd, char *dirnow)
|
|||||||
"set winwidth=1\n") < 0) {
|
"set winwidth=1\n") < 0) {
|
||||||
return FAIL;
|
return 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) {
|
||||||
return FAIL;
|
return FAIL;
|
||||||
@@ -900,7 +902,7 @@ static int makeopens(FILE *fd, char *dirnow)
|
|||||||
PUTLINE_FAIL("let &shortmess = s:shortmess_save");
|
PUTLINE_FAIL("let &shortmess = s:shortmess_save");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tab_firstwin != NULL && tab_firstwin->w_next != NULL) {
|
if (restore_height_width) {
|
||||||
// Restore 'winminheight' and 'winminwidth'.
|
// Restore 'winminheight' and 'winminwidth'.
|
||||||
PUTLINE_FAIL("let &winminheight = s:save_winminheight");
|
PUTLINE_FAIL("let &winminheight = s:save_winminheight");
|
||||||
PUTLINE_FAIL("let &winminwidth = s:save_winminwidth");
|
PUTLINE_FAIL("let &winminwidth = s:save_winminwidth");
|
||||||
|
Reference in New Issue
Block a user