mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
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 <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
d8a51fd628
commit
231b7099e5
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user