patch 8.0.0930: terminal buffers are stored in the viminfo file

Problem:    Terminal buffers are stored in the viminfo file while they can't
            be useful.
Solution:   Skip terminal buffers for file marks and buffer list

diff --git a/src/buffer.c b/src/buffer.c
index 369eec70986d8f89a5d2bd1e6e82834c985b2e8b..a33b349d9dd08d104b814affe7952616827bac1c 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5658,6 +5658,9 @@ write_viminfo_bufferlist(FILE *fp)
                || !buf->b_p_bl
 #ifdef FEAT_QUICKFIX
                || bt_quickfix(buf)
+#endif
+#ifdef FEAT_TERMINAL
+               || bt_terminal(buf)
 #endif
                || removable(buf->b_ffname))
            continue;

diff --git a/src/mark.c b/src/mark.c
index d93dfac23f5de35dcf4b9c86bcc9cbaece28eb07..db5f5715c60778bfa1e89eda7da28d50d15b235b 100644 (file)
--- a/src/mark.c
+++ b/src/mark.c
@@ -1649,6 +1649,19 @@ handle_viminfo_mark(garray_T *values, int force)
     }
 }
 
+/*
+ * Return TRUE if marks for "buf" should not be written.
+ */
+    static int
+skip_for_viminfo(buf_T *buf)
+{
+    return
+#ifdef FEAT_TERMINAL
+           bt_terminal(buf) ||
+#endif
+           removable(buf->b_ffname);
+}
+
     void
 write_viminfo_filemarks(FILE *fp)
 {
@@ -1681,7 +1694,7 @@ write_viminfo_filemarks(FILE *fp)
      * Move '0 to '1, '1 to '2, etc. until the matching one or '9
      * Set the '0 mark to current cursor position.
      */
-    if (curbuf->b_ffname != NULL && !removable(curbuf->b_ffname))
+    if (curbuf->b_ffname != NULL && !skip_for_viminfo(curbuf))
     {
        name = buflist_nr2name(curbuf->b_fnum, TRUE, FALSE);
        for (i = NMARKS; i < NMARKS + EXTRA_MARKS - 1; ++i)
@@ -1757,7 +1770,7 @@ write_viminfo_filemarks(FILE *fp)
            --idx;
        if (fm->fmark.fnum == 0
                || ((buf = buflist_findnr(fm->fmark.fnum)) != NULL
-                   && !removable(buf->b_ffname)))
+                   && !skip_for_viminfo(buf)))
            write_one_filemark(fp, fm, '-', '\'');
     }
 #endif
@@ -1917,7 +1930,8 @@ write_viminfo_marks(FILE *fp_out, garray_T *buflist)
                    }
            }
            if (is_mark_set && buf->b_ffname != NULL
-                     && buf->b_ffname[0] != NUL && !removable(buf->b_ffname))
+                     && buf->b_ffname[0] != NUL
+                     && !skip_for_viminfo(buf))
            {
                if (buflist == NULL)
                    write_buffer_marks(buf, fp_out);

diff --git a/src/version.c b/src/version.c
index cc7bb865d3ff58737fbcb8f7e2fe26d37f51446c..91f9b56703b0ea95f0276c98dd70a50afacbbbee 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    930,
 /**/
     929,
 /**/