diff mbox series

[bitbake-devel] contrib: vim: Fix up a few errors when reloading

Message ID 20230728155931.40207-1-JPEWhacker@gmail.com
State New
Headers show
Series [bitbake-devel] contrib: vim: Fix up a few errors when reloading | expand

Commit Message

Joshua Watt July 28, 2023, 3:59 p.m. UTC 
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

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 contrib/vim/indent/bitbake.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/contrib/vim/indent/bitbake.vim b/contrib/vim/indent/bitbake.vim
index 13810340..7ee9d699 100644
--- a/contrib/vim/indent/bitbake.vim
+++ b/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