From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 13 Feb 2007 03:01:39 +0000 (+0000)
Subject: updated for version 7.0-194
X-Git-Tag: v7.0.194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad40f02cd9a306924352c1647186ce745489fcfb;p=vim

updated for version 7.0-194
---

diff --git a/src/memline.c b/src/memline.c
index 6f59a9a9c..d0eb0f8bf 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 b89a0fad3..0c45c476b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    194,
 /**/
     193,
 /**/