diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-07-04 22:26:28 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-07-04 22:26:28 +0200 |
commit | 26d4b896a789e65df7ee0cf3e25056eabc523fda (patch) | |
tree | f1c170785d43bf5e41c4666ad83aa88a73e7f3ac /src/ex_docmd.c | |
parent | 92959fa46d305ded1da433ad6d9a8d38db240c74 (diff) |
patch 8.1.0149: session is wrong with multiple tabs when :lcd was usedv8.1.0149
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 #3152)
Diffstat (limited to 'src/ex_docmd.c')
-rw-r--r-- | src/ex_docmd.c | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 4d5036f229..fec3a8e37a 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -5491,7 +5491,7 @@ ex_abclear(exarg_T *eap) ex_autocmd(exarg_T *eap) { /* - * Disallow auto commands from .exrc and .vimrc in current + * Disallow autocommands from .exrc and .vimrc in current * directory for security reasons. */ if (secure) @@ -11080,10 +11080,13 @@ makeopens( #endif /* - * Close all windows but one. + * Close all windows and tabs but one. */ if (put_line(fd, "silent only") == FAIL) return FAIL; + 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 @@ -11193,9 +11196,33 @@ makeopens( */ tab_firstwin = firstwin; /* first window in tab page "tabnr" */ tab_topframe = topframe; + if ((ssop_flags & SSOP_TABPAGES)) + { + int num_tabs; + + /* + * 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) + { + tabpage_T *tp = find_tabpage(tabnr); + + if (tp == NULL) /* done all tab pages */ + break; + + if (tabnr > 1 && put_line(fd, "tabnew") == FAIL) + return FAIL; + } + + 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) { - int need_tabnew = FALSE; + int need_tabnext = FALSE; int cnr = 1; if ((ssop_flags & SSOP_TABPAGES)) @@ -11215,7 +11242,7 @@ makeopens( tab_topframe = tp->tp_topframe; } if (tabnr > 1) - need_tabnew = TRUE; + need_tabnext = TRUE; } /* @@ -11233,11 +11260,14 @@ makeopens( #endif ) { - 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; break; @@ -11245,7 +11275,7 @@ makeopens( } /* 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; /* @@ -11348,7 +11378,7 @@ makeopens( /* * Wipe out an empty unnamed buffer we started in. */ - if (put_line(fd, "if exists('s:wipebuf') && s:wipebuf != bufnr('%')") + if (put_line(fd, "if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0") == FAIL) return FAIL; if (put_line(fd, " silent exe 'bwipe ' . s:wipebuf") == FAIL) |