updated for version 7.2-261

diff --git a/src/fold.c b/src/fold.c
index 6567906be7d51209503022fed01e6279c26d3d19..a127bf67cc6d63400efa808f48eb02ef4b4b5fac 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -1607,11 +1607,11 @@ foldMarkAdjustRecurse(gap, line1, line2, amount, amount_after)
            }
            else
            {
-               /* 2, 3, or 5: need to correct nested folds too */
-               foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
-                                 line2 - fp->fd_top, amount, amount_after);
                if (fp->fd_top < top)
                {
+                   /* 2 or 3: need to correct nested folds too */
+                   foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
+                                 line2 - fp->fd_top, amount, amount_after);
                    if (last <= line2)
                    {
                        /* 2. fold contains line1, line2 is below fold */
@@ -1628,7 +1628,11 @@ foldMarkAdjustRecurse(gap, line1, line2, amount, amount_after)
                }
                else
                {
-                   /* 5. fold is below line1 and contains line2 */
+                   /* 5. fold is below line1 and contains line2; need to
+                    * correct nested folds too */
+                   foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
+                                 line2 - fp->fd_top, amount,
+                                 amount_after + (fp->fd_top - top));
                    if (amount == MAXLNUM)
                    {
                        fp->fd_len -= line2 - fp->fd_top + 1;

diff --git a/src/version.c b/src/version.c
index ac86367b3a1e6c5b73174cc3ed66fb7dd1a1245f..9ccfc525cceb9e83a72e3b5db663878cb362800b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    261,
 /**/
     260,
 /**/