summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-07-20 19:56:10 +0200
committerBram Moolenaar <Bram@vim.org>2018-07-20 19:56:10 +0200
commit0a6efcd27d62935c465b4406c0c0db9be10a0ddb (patch)
tree1545e6dccb5f27e45dfa8a4e1d500585df03b76b
parent9e42c866484fe0199e8b17e7c44489386173acc9 (diff)
patch 8.1.0198: there is no hint that syntax is disabled for 'redrawtime'v8.1.0198
Problem: There is no hint that syntax is disabled for 'redrawtime'. Solution: Add a message.
-rw-r--r--src/syntax.c11
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 3 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 7db69183ec..3c46a0e0e6 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3355,8 +3355,11 @@ syn_regexec(
}
#endif
#ifdef FEAT_RELTIME
- if (timed_out)
+ if (timed_out && !syn_win->w_s->b_syn_slow)
+ {
syn_win->w_s->b_syn_slow = TRUE;
+ MSG(_("'redrawtime' exceeded, syntax highlighting disabled"));
+ }
#endif
if (r > 0)
@@ -3575,11 +3578,13 @@ syn_cmd_iskeyword(exarg_T *eap, int syncing UNUSED)
if (*arg == NUL)
{
MSG_PUTS("\n");
- MSG_PUTS(_("syntax iskeyword "));
if (curwin->w_s->b_syn_isk != empty_option)
+ {
+ MSG_PUTS(_("syntax iskeyword "));
msg_outtrans(curwin->w_s->b_syn_isk);
+ }
else
- msg_outtrans((char_u *)"not set");
+ msg_outtrans((char_u *)_("syntax iskeyword not set"));
}
else
{
diff --git a/src/version.c b/src/version.c
index 86413b0a06..691800cfdf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 198,
+/**/
197,
/**/
196,