Commit126b09b

authored

Merge pull requestpython-mode#868 from jennaliu/develop

Fixpython-mode#826 "Pymode seems to freeze on opening a very simple file and trying to source folding.vim"

2 parents585b369 +02a6e69 commit126b09bCopy full SHA for 126b09b

File tree

-11

lines changed

-11

lines changed

Lines changed: 5 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -228,17 +228,11 @@ fun! s:BlockStart(lnum) "{{{`
`228`	`228`	`" W: don't Wrap around the end of the file`
`229`	`229`	`let previous_definition=searchpos(s:def_regex,'bnW')`
`230`	`230`
`231`		`-" Corner case of function being defined on the first line.`
`232`		`-if previous_definition[0]==1`
`233`		`-" Just skip the while loop.`
`234`		`-elseif previous_definition!= [0,0]`
`235`		`-" Lines that are blank have zero indent.`
`236`		`-while previous_definition!= [0,0]`
`237`		`-\&&indent(previous_definition[0])>=l:inferred_indent`
`238`		`-let previous_definition=searchpos(s:def_regex,'bnW')`
`239`		`-callcursor(previous_definition[0]-1,0)`
`240`		`-endwhile`
`241`		`-endif`
	`231`	`+while previous_definition[0]!=1&& previous_definition!= [0,0]`
	`232`	`+\&&indent(previous_definition[0])>=l:inferred_indent`
	`233`	`+let previous_definition=searchpos(s:def_regex,'bnW')`
	`234`	`+callcursor(previous_definition[0]-1,0)`
	`235`	`+endwhile`
`242`	`236`	`let last_def= previous_definition[0]`
`243`	`237`	`if last_def`
`244`	`238`	`callcursor(last_def,0)`

Comments

(0)