From a6d6cdd1654f5e8c7d700bb491d9506ad60bec32 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Mon, 16 Jan 2023 22:44:22 +0900
Subject: [vim] Use system-default border style

* 'rounded' on non-Windows platforms
* 'sharp' on Windows
---
 plugin/fzf.vim | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'plugin')

diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index 7d4d8fee..7a754515 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -511,7 +511,10 @@ try
     let height = s:calc_size(&lines, dict.down, dict)
     let optstr .= ' --height='.height
   endif
-  let optstr .= s:border_opt(get(dict, 'window', 0))
+  " Respect --border option given in 'options'
+  if stridx(optstr, '--border') < 0 && stridx(optstr, '--no-border') < 0
+    let optstr .= s:border_opt(get(dict, 'window', 0))
+  endif
   let prev_default_command = $FZF_DEFAULT_COMMAND
   if len(source_command)
     let $FZF_DEFAULT_COMMAND = source_command
@@ -755,9 +758,9 @@ function! s:border_opt(window)
   endif
 
   " Border style
-  let style = tolower(get(a:window, 'border', 'rounded'))
-  if !has_key(a:window, 'border') && !get(a:window, 'rounded', 1)
-    let style = 'sharp'
+  let style = tolower(get(a:window, 'border', ''))
+  if !has_key(a:window, 'border') && has_key(a:window, 'rounded')
+    let style = a:window.rounded ? 'rounded' : 'sharp'
   endif
   if style == 'none' || style == 'no'
     return ''
@@ -765,7 +768,7 @@ function! s:border_opt(window)
 
   " For --border styles, we need fzf 0.24.0 or above
   call fzf#exec('0.24.0')
-  let opt = ' --border=' . style
+  let opt = ' --border ' . style
   if has_key(a:window, 'highlight')
     let color = s:get_color('fg', a:window.highlight)
     if len(color)
-- 
cgit v1.2.3