1 files changed, 12 insertions, 12 deletions

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index b3bbdce9d9..8f631ae13b 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -837,7 +837,7 @@ static void clear_wininfo(buf_T *buf)
     buf->b_wininfo = wip->wi_next;
     if (wip->wi_optset) {
       clear_winopt(&wip->wi_opt);
-      deleteFoldRecurse(&wip->wi_folds);
+      deleteFoldRecurse(buf, &wip->wi_folds);
     }
     xfree(wip);
   }
@@ -1941,6 +1941,7 @@ void free_buf_options(buf_T *buf, int free_p_ff)
   vim_regfree(buf->b_s.b_cap_prog);
   buf->b_s.b_cap_prog = NULL;
   clear_string_option(&buf->b_s.b_p_spl);
+  clear_string_option(&buf->b_s.b_p_spo);
   clear_string_option(&buf->b_p_sua);
   clear_string_option(&buf->b_p_ft);
   clear_string_option(&buf->b_p_cink);
@@ -2502,7 +2503,7 @@ void buflist_setfpos(buf_T *const buf, win_T *const win,
     }
     if (copy_options && wip->wi_optset) {
       clear_winopt(&wip->wi_opt);
-      deleteFoldRecurse(&wip->wi_folds);
+      deleteFoldRecurse(buf, &wip->wi_folds);
     }
   }
   if (lnum != 0) {
@@ -2650,7 +2651,7 @@ void buflist_list(exarg_T *eap)
   int i;
 
   garray_T buflist;
-  buf_T **buflist_data = NULL, **p;
+  buf_T **buflist_data = NULL;
 
   if (vim_strchr(eap->arg, 't')) {
     ga_init(&buflist, sizeof(buf_T *), 50);
@@ -2662,13 +2663,14 @@ void buflist_list(exarg_T *eap)
     qsort(buflist.ga_data, (size_t)buflist.ga_len,
           sizeof(buf_T *), buf_time_compare);
 
-    p = buflist_data = (buf_T **)buflist.ga_data;
-    buf = *p;
+    buflist_data = (buf_T **)buflist.ga_data;
+    buf = *buflist_data;
   }
+  buf_T **p = buflist_data;
 
   for (;
        buf != NULL && !got_int;
-       buf = buflist_data
+       buf = buflist_data != NULL
        ? (++p < buflist_data + buflist.ga_len ? *p : NULL)
        : buf->b_next) {
     const bool is_terminal = buf->terminal;
@@ -5395,13 +5397,11 @@ bool buf_hide(const buf_T *const buf)
 char_u *buf_spname(buf_T *buf)
 {
   if (bt_quickfix(buf)) {
-    win_T       *win;
-    tabpage_T   *tp;
+    win_T *win;
+    tabpage_T *tp;
 
-    /*
-     * For location list window, w_llist_ref points to the location list.
-     * For quickfix window, w_llist_ref is NULL.
-     */
+    // For location list window, w_llist_ref points to the location list.
+    // For quickfix window, w_llist_ref is NULL.
     if (find_win_for_buf(buf, &win, &tp) && win->w_llist_ref != NULL) {
       return (char_u *)_(msg_loclist);
     } else {