mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 06:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0149: session is wrong with multiple tabs when :lcd was used

Browse Source 
Problem:    The generated sessions file does not restore tabs properly if :lcd
            was used in one of them.
Solution:   Create the tab pages before setting the directory. (Yee Cheng
            Chin, closes vim/vim#3152)
26d4b896a7
This commit is contained in:
Jan Edmund Lazo
2020-12-17 21:53:14 -05:00
parent c762f5220b
commit ca2551bc9b
3 changed files with 85 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/nvim/ex_session.c
View File

@@ -526,8 +526,12 @@ static int makeopens(FILE *fd, char_u *dirnow)
}
}
// Close all windows but one.
// Close all windows and tabs but one.
PUTLINE_FAIL("silent only");
if ((ssop_flags & SSOP_TABPAGES)
&& put_line(fd, "silent tabonly") == FAIL) {
return FAIL;
}
//
// Now a :cd command to the session directory or the current directory
@@ -606,13 +610,34 @@ static int makeopens(FILE *fd, char_u *dirnow)
//
tab_firstwin = firstwin; // First window in tab page "tabnr".
tab_topframe = topframe;
if ((ssop_flags & SSOP_TABPAGES)) {
// Similar to ses_win_rec() below, populate the tab pages first so
// later local options won't be copied to the new tabs.
for (tabnr = 1;; tabnr++) {
const tabpage_T *const tp = find_tabpage(tabnr);
if (tp == NULL) { // done all tab pages
break;
}
if (tabnr > 1 && put_line(fd, "tabnew") == FAIL) {
return FAIL;
}
}
const int num_tabs = tabnr - 1;
if (num_tabs > 1
&& (fprintf(fd, "tabnext -%d", num_tabs - 1) < 0
|| put_eol(fd) == FAIL)) {
return FAIL;
}
}
for (tabnr = 1;; tabnr++) {
tabpage_T *tp = find_tabpage(tabnr);
if (tp == NULL) {
break; // done all tab pages
}
int need_tabnew = false;
bool need_tabnext = false;
int cnr = 1;
if ((ssop_flags & SSOP_TABPAGES)) {
@@ -624,7 +649,7 @@ static int makeopens(FILE *fd, char_u *dirnow)
tab_topframe = tp->tp_topframe;
}
if (tabnr > 1) {
need_tabnew = true;
need_tabnext = true;
}
}
@@ -639,11 +664,15 @@ static int makeopens(FILE *fd, char_u *dirnow)
&& !bt_help(wp->w_buffer)
&& !bt_nofile(wp->w_buffer)
) {
if (fputs(need_tabnew ? "tabedit " : "edit ", fd) < 0
if (need_tabnext && put_line(fd, "tabnext") == FAIL) {
return FAIL;
}
need_tabnext = false;
if (fputs("edit ", fd) < 0
|| ses_fname(fd, wp->w_buffer, &ssop_flags, true) == FAIL) {
return FAIL;
}
need_tabnew = false;
if (!wp->w_arg_idx_invalid) {
edited_win = wp;
}
@@ -652,7 +681,7 @@ static int makeopens(FILE *fd, char_u *dirnow)
}
// If no file got edited create an empty tab page.
if (need_tabnew && put_line(fd, "tabnew") == FAIL) {
if (need_tabnext && put_line(fd, "tabnext") == FAIL) {
return FAIL;
}
@@ -775,6 +804,7 @@ static int makeopens(FILE *fd, char_u *dirnow)
//
if (fprintf(fd, "%s",
"if exists('s:wipebuf') "
"&& len(win_findbuf(s:wipebuf)) == 0"
"&& getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'\n"
" silent exe 'bwipe ' . s:wipebuf\n"
"endif\n"