patch 8.2.2011: "syn sync" reports a very large number
Problem: "syn sync" reports a very large number.
Solution: Use "at the first line".
diff --git a/src/syntax.c b/src/syntax.c
index 6025889..2245dc6 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3869,9 +3869,14 @@
msg_puts(_("no syncing"));
else
{
- msg_puts(_("syncing starts "));
- msg_outnum(curwin->w_s->b_syn_sync_minlines);
- msg_puts(_(" lines before top line"));
+ if (curwin->w_s->b_syn_sync_minlines == MAXLNUM)
+ msg_puts(_("syncing starts at the first line"));
+ else
+ {
+ msg_puts(_("syncing starts "));
+ msg_outnum(curwin->w_s->b_syn_sync_minlines);
+ msg_puts(_(" lines before top line"));
+ }
syn_match_msg();
}
return;
@@ -3935,19 +3940,24 @@
|| curwin->w_s->b_syn_sync_minlines > 0)
{
msg_puts("; ");
- if (curwin->w_s->b_syn_sync_minlines > 0)
+ if (curwin->w_s->b_syn_sync_minlines == MAXLNUM)
+ msg_puts(_("from the first line"));
+ else
{
- msg_puts(_("minimal "));
- msg_outnum(curwin->w_s->b_syn_sync_minlines);
- if (curwin->w_s->b_syn_sync_maxlines)
- msg_puts(", ");
+ if (curwin->w_s->b_syn_sync_minlines > 0)
+ {
+ msg_puts(_("minimal "));
+ msg_outnum(curwin->w_s->b_syn_sync_minlines);
+ if (curwin->w_s->b_syn_sync_maxlines)
+ msg_puts(", ");
+ }
+ if (curwin->w_s->b_syn_sync_maxlines > 0)
+ {
+ msg_puts(_("maximal "));
+ msg_outnum(curwin->w_s->b_syn_sync_maxlines);
+ }
+ msg_puts(_(" lines before top line"));
}
- if (curwin->w_s->b_syn_sync_maxlines > 0)
- {
- msg_puts(_("maximal "));
- msg_outnum(curwin->w_s->b_syn_sync_maxlines);
- }
- msg_puts(_(" lines before top line"));
}
}
diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index dc05355..f668a50 100644
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -316,6 +316,8 @@
syn sync ccomment
endif
call assert_notmatch('on C-style comments', execute('syntax sync'))
+ syn sync fromstart
+ call assert_match('syncing starts at the first line', execute('syntax sync'))
syn clear
endfunc
@@ -735,6 +737,7 @@
redir END
call assert_equal("\nsyntax foldlevel start", @c)
syn sync fromstart
+ call assert_match('from the first line$', execute('syn sync'))
let a = map(range(3,9), 'foldclosed(v:val)')
call assert_equal([3,3,3,3,3,3,3], a) " attached cascade folds together
let a = map(range(10,15), 'foldclosed(v:val)')
diff --git a/src/version.c b/src/version.c
index c56640d..80d2af9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2011,
+/**/
2010,
/**/
2009,