From 231b7099e5979ac31b8c178de4e68f7a7269b404 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Fri, 28 Jul 2023 09:59:31 -0600 Subject: bitbake: contrib: vim: Fix up a few errors when reloading Fixes a few errors when the bitbake indent plugin is reloaded: 1) Define functions with "!" so that vim doens't issue a warning when they are replaced 2) Rename GetPythonIndent -> GetBBPythonIndent to prevent potential conflict with other plugins (Bitbake rev: b7109acb96e416e3c537b6b51f7c1fec2ca89371) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bitbake/contrib/vim/indent/bitbake.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/contrib') diff --git a/bitbake/contrib/vim/indent/bitbake.vim b/bitbake/contrib/vim/indent/bitbake.vim index 1381034098..7ee9d69938 100644 --- a/bitbake/contrib/vim/indent/bitbake.vim +++ b/bitbake/contrib/vim/indent/bitbake.vim @@ -40,7 +40,7 @@ set cpo&vim let s:maxoff = 50 " maximum number of lines to look backwards for () -function GetPythonIndent(lnum) +function! GetBBPythonIndent(lnum) " If this line is explicitly joined: If the previous line was also joined, " line it up with that one, otherwise add two 'shiftwidth' @@ -257,7 +257,7 @@ let b:did_indent = 1 setlocal indentkeys+=0\" -function BitbakeIndent(lnum) +function! BitbakeIndent(lnum) if !has('syntax_items') return -1 endif @@ -315,7 +315,7 @@ function BitbakeIndent(lnum) endif if index(["bbPyDefRegion", "bbPyFuncRegion"], name) != -1 - let ret = GetPythonIndent(a:lnum) + let ret = GetBBPythonIndent(a:lnum) " Should normally always be indented by at least one shiftwidth; but allow " return of -1 (defer to autoindent) or -2 (force indent to 0) if ret == 0 -- cgit v1.2.3-54-g00ecf