summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-05-01 00:42:24 +0100
committerBram Moolenaar <Bram@vim.org>2022-05-01 00:42:24 +0100
commitb4011afe53ce2d065e49718b8c5b9974b7022f92 (patch)
tree799ae2751bae16542a617a10fcb09f35199e00ff
parentd7c9564d8d24343f2e27205633032dd6ebe5232c (diff)
patch 8.2.4851: compiler warning for uninitialized variablev8.2.4851
Problem: Compiler warning for uninitialized variable. Solution: Use another variable to decide to restore option values.
-rw-r--r--src/session.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/session.c b/src/session.c
index d91ae19818..795438cd83 100644
--- a/src/session.c
+++ b/src/session.c
@@ -620,6 +620,7 @@ makeopens(
int only_save_windows = TRUE;
int nr;
int restore_size = TRUE;
+ int restore_height_width = FALSE;
win_T *wp;
char_u *sname;
win_T *edited_win = NULL;
@@ -887,6 +888,7 @@ makeopens(
|| put_line(fd, "set winminwidth=0") == FAIL
|| put_line(fd, "set winwidth=1") == FAIL)
goto fail;
+ restore_height_width = TRUE;
}
if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL)
goto fail;
@@ -979,7 +981,7 @@ makeopens(
goto fail;
}
- if (tab_firstwin->w_next != NULL)
+ if (restore_height_width)
{
// Restore 'winminheight' and 'winminwidth'.
if (put_line(fd, "let &winminheight = s:save_winminheight") == FAIL
diff --git a/src/version.c b/src/version.c
index 0e08c297e9..7b36e622e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4851,
+/**/
4850,
/**/
4849,