From 0f4af384571aaf6bcf9146c345feb5c6916c6790 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Fri, 27 Jan 2023 14:00:12 +0900
Subject: [PATCH] [vim] Simplify --border injection

Prepend the border options so that the user can override them in
'options' entry of the spec.
---
 plugin/fzf.vim | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index e0eb8718..94065e3c 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -512,9 +512,7 @@ try
     let optstr .= ' --height='.height
   endif
   " Respect --border option given in 'options'
-  if match(optstr, '--border\([^-]\|$\)') < 0 && match(optstr, '--no-border\([^-]\|$\)') < 0
-    let optstr .= s:border_opt(get(dict, 'window', 0))
-  endif
+  let optstr = join([s:border_opt(get(dict, 'window', 0)), optstr])
   let prev_default_command = $FZF_DEFAULT_COMMAND
   if len(source_command)
     let $FZF_DEFAULT_COMMAND = source_command