Commitf756847

committed

Merge branch 'develop' of github.com:klen/python-mode into develop

2 parentsc9fbaf1 +ded8edb commitf756847Copy full SHA for f756847

File tree

+19

-1

lines changed

+19

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ for module in ('pudb', 'ipdb'):`
`23`	`23`	`try:`
`24`	`24`	`find_module(module)`
`25`	`25`	`vim.command('let g:pymode_breakpoint_cmd = "import %s; %s.set_trace() # XXX BREAKPOINT"'% (module, module))`
	`26`	`+break`
`26`	`27`	`except ImportError:`
`27`	`28`	`continue`
`28`	`29`	`EOF`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,17 @@ EOF`
`113`	`113`	`let &efm=s:efm`
`114`	`114`
`115`	`115`	`cgetexpr(l:traceback)`
	`116`	`+" If a range is run (starting other than at line 1), fix the reported error line numbers for`
	`117`	`+" the current buffer`
	`118`	`+ifa:line1 >1`
	`119`	`+let qflist=getqflist()`
	`120`	`+foriin qflist`
	`121`	`+ifi.bufnr==bufnr("")`
	`122`	`+leti.lnum=i.lnum-1+a:line1`
	`123`	`+endif`
	`124`	`+endfor`
	`125`	`+callsetqflist(qflist)`
	`126`	`+endif`
`116`	`127`
`117`	`128`	`callpymode#QuickfixOpen(0,g:pymode_lint_hold,g:pymode_lint_maxheight,g:pymode_lint_minheight,0)`
`118`	`129`	`let &efm=l:_efm`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,13 @@ activate_this = os.path.join(os.path.join(ve_dir, 'bin'), 'activate_this.py')`
`23`	`23`	`if not os.path.exists(activate_this):`
`24`	`24`	`activate_this= os.path.join(os.path.join(ve_dir,'Scripts'),'activate_this.py')`
`25`	`25`
`26`		`-execfile(activate_this,dict(__file__=activate_this))`
	`26`	`+f=open(activate_this)`
	`27`	`+try:`
	`28`	`+source=f.read()`
	`29`	`+finally:`
	`30`	`+f.close()`
	`31`	`+`
	`32`	`+exec(compile(source, activate_this,'exec'),dict(__file__=activate_this))`
`27`	`33`	`EOF`
`28`	`34`
`29`	`35`	`callpymode#WideMessage("Activate virtualenv:".$VIRTUAL_ENV)`

Comments

(0)