Skip to content

Commit aff5130

Browse files
author
vim-IDE
committed
Merge branch 'develop' of https://github.com/klen/python-mode into develop
2 parents d854dc2 + af42681 commit aff5130

File tree

174 files changed

+27151
-4610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+27151
-4610
lines changed

‎AUTHORS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@ Contributors:
3333
* Mel Boyce (http://github.com/syngin)
3434
* Mohammed (http://github.com/mbadran);
3535
* Naoya Inada (http://github.com/naoina);
36+
* Nate Zhang (https://github.com/natezhang93)
37+
* Paweł Korzeniewski (https://github.com/korzeniewskipl)
3638
* Pedro Algarvio (http://github.com/s0undt3ch);
3739
* Phillip Cloud (http://github.com/cpcloud);
3840
* Piet Delport (http://github.com/pjdelport);
3941
* Robert David Grant (http://github.com/bgrant);
42+
* Robin Schneider (https://github.com/ypid)
4043
* Ronald Andreu Kaiser (http://github.com/cathoderay);
4144
* Samir Benmendil (https://github.com/Ram-Z)
4245
* Sorin Ionescu (sorin-ionescu);

‎Changelog.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@ Changelog
33

44
* Pylama updated to version 5.0.5
55
* Rope libs updated
6+
* Add wdb to debugger list in breakpoint cmd
67
* Add 'pymode_options_max_line_length' option
78
* Add ability to set related checker options `:help pymode-lint-options`
89
Options added: 'pymode_lint_options_pep8', 'pymode_lint_options_pep257',
910
'pymode_lint_options_mccabe', 'pymode_lint_options_pyflakes',
1011
'pymode_lint_options_pylint'
12+
* Highlight comments inside class/function arg lists
13+
* Don't fold single line def
14+
* Don't skip a line when the first docstring contains text
15+
* Add Python documentation vertical display option
16+
* Rope: correct refactoring function calls
1117

1218

1319
## 2014-06-11 0.8.1

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ rope:
3333
@cp -r $(CURDIR)/_/rope/rope $(CURDIR)/pymode/libs/.
3434

3535
$(PYLAMA):
36-
cp -r ~/Dropbox/projects/pylama/pylama $(PYLAMA)
36+
cp -r $$PRJDIR/pylama/pylama $(PYLAMA)
3737

3838
$(PYLAMA)/lint/pylama_pylint:
39-
cp -r ~/Dropbox/projects/pylama/plugins/pylama_pylint/pylama_pylint/ $(PYLAMA)/lint/pylama_pylint
39+
cp -r $$PRJDIR/pylama/plugins/pylama_pylint/pylama_pylint/ $(PYLAMA)/lint/pylama_pylint
4040

4141
$(CURDIR)/build:
4242
mkdir -p $(CURDIR)/build/usr/share/vim/addons

‎autoload/pymode/folding.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fun! pymode#folding#expr(lnum) "{{{
5151

5252
if line =~ s:def_regex
5353
" single line def
54-
if indent(a:lnum) >= indent(a:lnum+1)
54+
if indent(a:lnum) >= indent(a:lnum+1) && getline(prevnonblank(a:lnum)) !~ ':\s*$'
5555
return '='
5656
endif
5757
" Check if last decorator is before the last def

0 commit comments

Comments
 (0)