From 9028af96aa9b0d477ea8ba8cae61ea216477111d Mon Sep 17 00:00:00 2001
From: Girish Palya <girishji@gmail.com>
Date: Thu, 1 Jun 2023 11:18:20 +0200
Subject: [PATCH] Fix merge issue

M  autoload/lsp/completion.vim
---
 autoload/lsp/completion.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/autoload/lsp/completion.vim b/autoload/lsp/completion.vim
index 3119db3..5a3797c 100644
--- a/autoload/lsp/completion.vim
+++ b/autoload/lsp/completion.vim
@@ -657,11 +657,10 @@ export def BufferInit(lspserver: dict<any>, bnr: number, ftype: string)
   if opt.lspOptions.autoComplete
     if lspserver.completionLazyDoc
       setbufvar(bnr, '&completeopt', 'menuone,popuphidden,noinsert,noselect')
-      setbufvar(bnr, '&completepopup', 'width:80,highlight:Pmenu,align:item,border:off')
     else
       setbufvar(bnr, '&completeopt', 'menuone,popup,noinsert,noselect')
-      setbufvar(bnr, '&completepopup', 'border:off')
     endif
+    setbufvar(bnr, '&completepopup', 'width:80,highlight:Pmenu,align:item,border:off')
     # <Enter> in insert mode stops completion and inserts a <Enter>
     if !opt.lspOptions.noNewlineInCompletion
       :inoremap <expr> <buffer> <CR> pumvisible() ? "\<C-Y>\<CR>" : "\<CR>"
-- 
2.48.1