patch 8.1.0790: code for creating tabpages in session is too complex
Problem: Code for creating tabpages in session is too complex.
Solution: Simplify the code. (Jason Franklin)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 387d26d..62f507c 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -11401,26 +11401,14 @@
tab_topframe = topframe;
if ((ssop_flags & SSOP_TABPAGES))
{
- int num_tabs;
+ tabpage_T *tp;
- /*
- * 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)
+ // Similar to ses_win_rec() below, populate the tab pages first so
+ // later local options won't be copied to the new tabs.
+ FOR_ALL_TABPAGES(tp)
+ if (tp->tp_next != NULL && 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))
+ if (first_tabpage->tp_next != NULL && put_line(fd, "tabrewind") == FAIL)
return FAIL;
}
for (tabnr = 1; ; ++tabnr)
diff --git a/src/version.c b/src/version.c
index 3647397..8d2050f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 790,
+/**/
789,
/**/
788,