diff options
-rw-r--r-- | src/memline.c | 25 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 22 insertions, 5 deletions
diff --git a/src/memline.c b/src/memline.c index 6f59a9a9ce..d0eb0f8bfe 100644 --- a/src/memline.c +++ b/src/memline.c @@ -2054,13 +2054,21 @@ ml_get_buf(buf, lnum, will_change) linenr_T lnum; int will_change; /* line will be changed */ { - bhdr_T *hp; - DATA_BL *dp; - char_u *ptr; + bhdr_T *hp; + DATA_BL *dp; + char_u *ptr; + static int recursive = 0; if (lnum > buf->b_ml.ml_line_count) /* invalid line number */ { - EMSGN(_("E315: ml_get: invalid lnum: %ld"), lnum); + if (recursive == 0) + { + /* Avoid giving this message for a recursive call, may happen when + * the GUI redraws part of the text. */ + ++recursive; + EMSGN(_("E315: ml_get: invalid lnum: %ld"), lnum); + --recursive; + } errorret: STRCPY(IObuff, "???"); return IObuff; @@ -2088,7 +2096,14 @@ errorret: */ if ((hp = ml_find_line(buf, lnum, ML_FIND)) == NULL) { - EMSGN(_("E316: ml_get: cannot find line %ld"), lnum); + if (recursive == 0) + { + /* Avoid giving this message for a recursive call, may happen + * when the GUI redraws part of the text. */ + ++recursive; + EMSGN(_("E316: ml_get: cannot find line %ld"), lnum); + --recursive; + } goto errorret; } diff --git a/src/version.c b/src/version.c index b89a0fad34..0c45c476b8 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 194, +/**/ 193, /**/ 192, |