Version 2.8.3.6: minor bugfix: Fixed a small bug introduced in the previous release.

hellhound · vim-scripts · commit aeaa4c9882eb · 2010-10-17T18:52:50.000-07:00
diff --git a/plugin/python_ifold.a.vim b/plugin/python_ifold.a.vim
@@ -2,9 +2,9 @@
 " Language:	Python
 " Author:	Jorrit Wiersma (foldexpr), Max Ischenko (foldtext), Robert,
 " Ames (line counts), Jean-Pierre Chauvel (bugfixes and improvements)
-" Last Change:	2008 Apr 1
-" Version:	2.8.3.5.a
-
+" Last Change:	2008 Apr 18
+" Version:	2.8.3.6.a
+" Bugfixes: Jean-Pierre Chauvel
 
 
 if exists("b:did_ftplugin")
@@ -115,7 +115,7 @@ function! GetPythonFoldAccurately(lnum)
     endif
 
     " Classes and functions get their own folds
-    if line =~ '^\s*\(class\|def\)\s'
+      if line =~ '^\s*\(class\|def\)\s'
     " Verify if the next line is a class or function definition
     " as well
         let imm_nnum = a:lnum + 1
@@ -135,7 +135,7 @@ function! GetPythonFoldAccurately(lnum)
     " we end a fold.
     let nnonblank = nextnonblank(a:lnum + 1)
     let nextline = getline(nnonblank) 
-    if (nextline !~ '^\s*#.*') || (nextline =~ '^\s*#\+\s*\(class\|def\)\s')
+    if (nextline !~ '^\s*#\+.*')
         let nind = indent(nnonblank)
         if nind <= b:nestinglevel
             let b:nestinglevel = nind
diff --git a/plugin/python_ifold.b.vim b/plugin/python_ifold.b.vim
@@ -2,9 +2,9 @@
 " Language:	Python
 " Author:	Jorrit Wiersma (foldexpr), Max Ischenko (foldtext), Robert,
 " Ames (line counts), Jean-Pierre Chauvel (bugfixes and improvements)
-" Last Change:	2008 Apr 1
-" Version:	2.8.3.5.b
-
+" Last Change:	2008 Apr 18
+" Version:	2.8.3.6.b
+" Bugfixes: Jean-Pierre Chauvel
 
 
 if exists("b:did_ftplugin")
@@ -115,7 +115,7 @@ function! GetPythonFoldAccurately(lnum)
     endif
 
     " Classes and functions get their own folds
-    if line =~ '^\s*\(class\|def\)\s'
+      if line =~ '^\s*\(class\|def\)\s'
     " Verify if the next line is a class or function definition
     " as well
         let imm_nnum = a:lnum + 1
@@ -135,7 +135,7 @@ function! GetPythonFoldAccurately(lnum)
     " we end a fold.
     let nnonblank = nextnonblank(a:lnum + 1)
     let nextline = getline(nnonblank) 
-    if (nextline !~ '^\s*#.*') || (nextline =~ '^\s*#\+\s*\(class\|def\)\s')
+    if (nextline !~ '^\s*#\+.*')
         let nind = indent(nnonblank)
         if nind <= b:nestinglevel
             let b:nestinglevel = nind
diff --git a/plugin/python_ifold.c.vim b/plugin/python_ifold.c.vim
@@ -2,9 +2,9 @@
 " Language:	Python
 " Author:	Jorrit Wiersma (foldexpr), Max Ischenko (foldtext), Robert,
 " Ames (line counts), Jean-Pierre Chauvel (bugfixes and improvements)
-" Last Change:	2008 Apr 1
-" Version:	2.8.3.5.c
-
+" Last Change:	2008 Apr 18
+" Version:	2.8.3.6.c
+" Bugfixes: Jean-Pierre Chauvel
 
 
 if exists("b:did_ftplugin")
@@ -123,7 +123,7 @@ function! GetPythonFoldAccurately(lnum)
     endif
 
     " Classes and functions get their own folds
-    if line =~ '^\s*\(class\|def\)\s'
+      if line =~ '^\s*\(class\|def\)\s'
     " Verify if the next line is a class or function definition
     " as well
         let imm_nnum = a:lnum + 1
@@ -143,7 +143,7 @@ function! GetPythonFoldAccurately(lnum)
     " we end a fold.
     let nnonblank = nextnonblank(a:lnum + 1)
     let nextline = getline(nnonblank) 
-    if (nextline !~ '^\s*#.*') || (nextline =~ '^\s*#\+\s*\(class\|def\)\s')
+    if (nextline !~ '^\s*#\+.*')
         let nind = indent(nnonblank)
         if nind <= b:nestinglevel
             let b:nestinglevel = nind
