Mercurial > vim

changeset 28654:8fc86c943863 v8.2.4851

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4851: compiler warning for uninitialized variable Commit: https://github.com/vim/vim/commit/b4011afe53ce2d065e49718b8c5b9974b7022f92 Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 1 00:42:24 2022 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 01 May 2022 01:45:04 +0200
parents 94f2550a1af1
children c68977e0006e
files src/session.c src/version.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,