GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.4.686

Browse Source 
Problem:    "zr" and "zm" do not take a count.
Solution:   Implement the count, restrict the fold level to the maximum
            nesting depth.  (Marcin Szamotulski)
This commit is contained in:
Bram Moolenaar
2015-03-31 17:46:22 +02:00
parent 0e462411ca
commit 7d2757a472
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/fold.txt
View File

@ -365,7 +365,7 @@ zX Undo manually opened and closed folds: re-apply 'foldlevel'.
Also forces recomputing folds, like |zx|.
*zm*
zm Fold more: Subtract one from 'foldlevel'. If 'foldlevel' was
zm Fold more: Subtract |v:count1| from 'foldlevel'. If 'foldlevel' was
already zero nothing happens.
'foldenable' will be set.
@ -374,7 +374,7 @@ zM Close all folds: set 'foldlevel' to 0.
'foldenable' will be set.
*zr*
zr Reduce folding: Add one to 'foldlevel'.
zr Reduce folding: Add |v:count1| to 'foldlevel'.
*zR*
zR Open all folds. This sets 'foldlevel' to highest fold level.

14
src/normal.c
View File

@ -5098,7 +5098,11 @@ dozet:
/* "zm": fold more */
case 'm': if (curwin->w_p_fdl > 0)
--curwin->w_p_fdl;
{
curwin->w_p_fdl -= cap->count1;
if (curwin->w_p_fdl < 0)
curwin->w_p_fdl = 0;
}
old_fdl = -1; /* force an update */
curwin->w_p_fen = TRUE;
break;
@ -5110,7 +5114,13 @@ dozet:
break;
/* "zr": reduce folding */
case 'r': ++curwin->w_p_fdl;
case 'r': curwin->w_p_fdl += cap->count1;
{
int d = getDeepestNesting();
if (curwin->w_p_fdl >= d)
curwin->w_p_fdl = d;
}
break;
/* "zR": open all folds */

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
686,
/**/
685,
/**/