patch 8.1.0230: directly checking 'buftype' value

Problem:    Directly checking 'buftype' value.
Solution:   Add the bt_normal() function. (Yegappan Lakshmanan)

diff --git a/src/buffer.c b/src/buffer.c
index 1f1833fc74450ff6af4eb6c3ebd127b261a21daa..f76d849a2fe2c346e476615697ec12ad68f4684a 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5626,6 +5626,15 @@ write_viminfo_bufferlist(FILE *fp)
 }
 #endif
 
+/*
+ * Return TRUE if "buf" is a normal buffer, 'buftype' is empty.
+ */
+    int
+bt_normal(buf_T *buf)
+{
+    return buf != NULL && buf->b_p_bt[0] == NUL;
+}
+
 /*
  * Return TRUE if "buf" is the quickfix buffer.
  */

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 6682286210e1031c40ecce49415392e904524b4f..0539a5114b98ec077ee606da4c2b1e341ef9e0ca 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -11768,7 +11768,7 @@ put_view(
      */
     if ((*flagp & SSOP_FOLDS)
            && wp->w_buffer->b_ffname != NULL
-           && (*wp->w_buffer->b_p_bt == NUL || bt_help(wp->w_buffer)))
+           && (bt_normal(wp->w_buffer) || bt_help(wp->w_buffer)))
     {
        if (put_folds(fd, wp) == FAIL)
            return FAIL;

diff --git a/src/fileio.c b/src/fileio.c
index 07b241ece5ee618162c02594ffe250185523ab28..281191cfbf77c07226cf7c8a320361e19b7daddf 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6897,7 +6897,7 @@ buf_check_timestamp(
      * this buffer. */
     if (buf->b_ffname == NULL
            || buf->b_ml.ml_mfp == NULL
-           || *buf->b_p_bt != NUL
+           || !bt_normal(buf)
            || buf->b_saving
            || busy
 #ifdef FEAT_NETBEANS_INTG

diff --git a/src/proto/buffer.pro b/src/proto/buffer.pro
index 9e63fb60552e9aa7ef7a511c93bf349ddf1bc19f..6820d9734eb2df6e1d726a6611242df03d7f46bc 100644 (file)
--- a/src/proto/buffer.pro
+++ b/src/proto/buffer.pro
@@ -56,6 +56,7 @@ void ex_buffer_all(exarg_T *eap);
 void do_modelines(int flags);
 int read_viminfo_bufferlist(vir_T *virp, int writing);
 void write_viminfo_bufferlist(FILE *fp);
+int bt_normal(buf_T *buf);
 int bt_quickfix(buf_T *buf);
 int bt_terminal(buf_T *buf);
 int bt_help(buf_T *buf);

diff --git a/src/quickfix.c b/src/quickfix.c
index aac1e3414f29ae8c6b7455865568892aa71dbb8f..97bfb37cab7d15b986c698dabd189fb69f01ceeb 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2487,7 +2487,7 @@ qf_find_win_with_normal_buf(void)
     win_T      *wp;
 
     FOR_ALL_WINDOWS(wp)
-       if (wp->w_buffer->b_p_bt[0] == NUL)
+       if (bt_normal(wp->w_buffer))
            return wp;
 
     return NULL;
@@ -2563,7 +2563,7 @@ qf_goto_win_with_ll_file(win_T *use_win, int qf_fnum, qf_info_T *ll_ref)
            win = curwin;
            do
            {
-               if (win->w_buffer->b_p_bt[0] == NUL)
+               if (bt_normal(win->w_buffer))
                    break;
                if (win->w_prev == NULL)
                    win = lastwin;      /* wrap around the top */
@@ -2620,8 +2620,7 @@ qf_goto_win_with_qfl_file(int qf_fnum)
        }
 
        /* Remember a usable window. */
-       if (altwin == NULL && !win->w_p_pvw
-               && win->w_buffer->b_p_bt[0] == NUL)
+       if (altwin == NULL && !win->w_p_pvw && bt_normal(win->w_buffer))
            altwin = win;
     }
 

diff --git a/src/version.c b/src/version.c
index 5f7d908f1df7c2ddaec3c6ed6f92b79c678721ed..e0af0206f02ade7ce3c2b696be8e3afbe0c89b6a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    230,
 /**/
     229,
 /**/