From cb4b33faf782b45c527f3461286185f423173cba Mon Sep 17 00:00:00 2001
From: Conner McDaniel <connermcd@gmail.com>
Date: Wed, 29 Mar 2023 11:11:35 -0500
Subject: [PATCH 1/2] #1239 Add ability to bdelete buffers with CTRL-D from
 :Buffers command

---
 autoload/fzf/vim.vim | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/autoload/fzf/vim.vim b/autoload/fzf/vim.vim
index 6eac698b..80262bf5 100755
--- a/autoload/fzf/vim.vim
+++ b/autoload/fzf/vim.vim
@@ -739,7 +739,15 @@ function! s:bufopen(lines)
   if len(a:lines) < 2
     return
   endif
+
   let b = matchstr(a:lines[1], '\[\zs[0-9]*\ze\]')
+
+  if a:lines[0] == 'ctrl-d'
+    execute 'silent bdelete' b
+    call fzf#vim#buffers()
+    return
+  endif
+
   if empty(a:lines[0]) && get(g:, 'fzf_buffers_jump')
     let [t, w] = s:find_open_window(b)
     if t
@@ -747,6 +755,7 @@ function! s:bufopen(lines)
       return
     endif
   endif
+
   let cmd = s:action_for(a:lines[0])
   if !empty(cmd)
     execute 'silent' cmd
@@ -783,10 +792,11 @@ function! fzf#vim#buffers(...)
   let sorted = fzf#vim#_buflisted_sorted()
   let header_lines = '--header-lines=' . (bufnr('') == get(sorted, 0, 0) ? 1 : 0)
   let tabstop = len(max(sorted)) >= 4 ? 9 : 8
+  let expect_keys = join(keys(get(g:, 'fzf_action', s:default_action)), ',')
   return s:fzf('buffers', {
   \ 'source':  map(sorted, 'fzf#vim#_format_buffer(v:val)'),
   \ 'sink*':   s:function('s:bufopen'),
-  \ 'options': ['+m', '-x', '--tiebreak=index', header_lines, '--ansi', '-d', '\t', '--with-nth', '3..', '-n', '2,1..2', '--prompt', 'Buf> ', '--query', query, '--preview-window', '+{2}-/2', '--tabstop', tabstop]
+  \ 'options': ['+m', '-x', '--tiebreak=index', header_lines, '--ansi', '-d', '\t', '--with-nth', '3..', '-n', '2,1..2', '--prompt', 'Buf> ', '--query', query, '--preview-window', '+{2}-/2', '--tabstop', tabstop, '--header', ':: Press '.s:magenta('CTRL-D', 'Special').' to delete buffer', '--expect', 'ctrl-d,'.expect_keys]
   \}, args)
 endfunction
 

From 7969a7dd9ff67e4107af1419675b666fc888b988 Mon Sep 17 00:00:00 2001
From: Conner McDaniel <connermcd@gmail.com>
Date: Wed, 29 Mar 2023 11:52:19 -0500
Subject: [PATCH 2/2] Delete multiple buffers with --multi as per #1239 #1272

This commit extends the :Buffers command with --multi to allow <Tab>
selection of multiple buffers that can then be deleted with CTRL-D or
opened into separate tabs/splits/vertical splits with
CTRL-T/CTRL-X/CTRL-V.
---
 autoload/fzf/vim.vim | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/autoload/fzf/vim.vim b/autoload/fzf/vim.vim
index 80262bf5..0d36c055 100755
--- a/autoload/fzf/vim.vim
+++ b/autoload/fzf/vim.vim
@@ -740,27 +740,31 @@ function! s:bufopen(lines)
     return
   endif
 
-  let b = matchstr(a:lines[1], '\[\zs[0-9]*\ze\]')
+  for idx in range(1, len(a:lines) - 1)
+    let b = matchstr(a:lines[idx], '\[\zs[0-9]*\ze\]')
 
-  if a:lines[0] == 'ctrl-d'
-    execute 'silent bdelete' b
-    call fzf#vim#buffers()
-    return
-  endif
+    if a:lines[0] == 'ctrl-d'
+      execute 'silent bdelete' b
+      if len(a:lines) == 2
+        call fzf#vim#buffers()
+      endif
+      continue
+    endif
 
-  if empty(a:lines[0]) && get(g:, 'fzf_buffers_jump')
-    let [t, w] = s:find_open_window(b)
-    if t
-      call s:jump(t, w)
-      return
+    if empty(a:lines[0]) && get(g:, 'fzf_buffers_jump')
+      let [t, w] = s:find_open_window(b)
+      if t
+        call s:jump(t, w)
+        return
+      endif
     endif
-  endif
 
-  let cmd = s:action_for(a:lines[0])
-  if !empty(cmd)
-    execute 'silent' cmd
-  endif
-  execute 'buffer' b
+    let cmd = s:action_for(a:lines[0])
+    if !empty(cmd)
+      execute 'silent' cmd
+    endif
+    execute 'buffer' b
+  endfor
 endfunction
 
 function! fzf#vim#_format_buffer(b)
@@ -796,7 +800,7 @@ function! fzf#vim#buffers(...)
   return s:fzf('buffers', {
   \ 'source':  map(sorted, 'fzf#vim#_format_buffer(v:val)'),
   \ 'sink*':   s:function('s:bufopen'),
-  \ 'options': ['+m', '-x', '--tiebreak=index', header_lines, '--ansi', '-d', '\t', '--with-nth', '3..', '-n', '2,1..2', '--prompt', 'Buf> ', '--query', query, '--preview-window', '+{2}-/2', '--tabstop', tabstop, '--header', ':: Press '.s:magenta('CTRL-D', 'Special').' to delete buffer', '--expect', 'ctrl-d,'.expect_keys]
+  \ 'options': ['--multi', '-x', '--tiebreak=index', header_lines, '--ansi', '-d', '\t', '--with-nth', '3..', '-n', '2,1..2', '--prompt', 'Buf> ', '--query', query, '--preview-window', '+{2}-/2', '--tabstop', tabstop, '--header', ':: Press '.s:magenta('CTRL-D', 'Special').' to delete buffer', '--expect', 'ctrl-d,'.expect_keys]
   \}, args)
 endfunction