From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 4 Jul 2013 20:31:03 +0000 (+0200)
Subject: updated for version 7.3.1306
X-Git-Tag: v7.3.1306
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=249f0dda510d4dc3b68ad3450d3b8f17eafa40b3;p=vim

updated for version 7.3.1306
Problem:    When redrawing the screen during startup the intro message may be
            cleared.
Solution:   Redisplay the intro message when appropriate.
---

diff --git a/src/proto/version.pro b/src/proto/version.pro
index 3f371f9b8..e6fb78f06 100644
--- a/src/proto/version.pro
+++ b/src/proto/version.pro
@@ -4,6 +4,7 @@ int highest_patch __ARGS((void));
 int has_patch __ARGS((int n));
 void ex_version __ARGS((exarg_T *eap));
 void list_version __ARGS((void));
+void maybe_intro_message __ARGS((void));
 void intro_message __ARGS((int colon));
 void ex_intro __ARGS((exarg_T *eap));
 /* vim: set ft=c : */
diff --git a/src/screen.c b/src/screen.c
index d68a84b99..e5636adbf 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -389,7 +389,6 @@ redraw_asap(type)
 	    }
 	    ret = 4;
 	}
-	setcursor();
     }
 
     vim_free(screenline);
@@ -405,6 +404,11 @@ redraw_asap(type)
 	vim_free(screenline2);
 #endif
 
+    /* Show the intro message when appropriate. */
+    maybe_intro_message();
+
+    setcursor();
+
     return ret;
 }
 
@@ -715,13 +719,8 @@ update_screen(type)
 	showmode();
 
     /* May put up an introductory message when not editing a file */
-    if (!did_intro && bufempty()
-	    && curbuf->b_fname == NULL
-#ifdef FEAT_WINDOWS
-	    && firstwin->w_next == NULL
-#endif
-	    && vim_strchr(p_shm, SHM_INTRO) == NULL)
-	intro_message(FALSE);
+    if (!did_intro)
+	maybe_intro_message();
     did_intro = TRUE;
 
 #ifdef FEAT_GUI
diff --git a/src/version.c b/src/version.c
index 112250606..182ca0130 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1306,
 /**/
     1305,
 /**/
@@ -3776,6 +3778,21 @@ version_msg(s)
 
 static void do_intro_line __ARGS((int row, char_u *mesg, int add_version, int attr));
 
+/*
+ * Show the intro message when not editing a file.
+ */
+    void
+maybe_intro_message()
+{
+    if (bufempty()
+	    && curbuf->b_fname == NULL
+#ifdef FEAT_WINDOWS
+	    && firstwin->w_next == NULL
+#endif
+	    && vim_strchr(p_shm, SHM_INTRO) == NULL)
+	intro_message(FALSE);
+}
+
 /*
  * Give an introductory message about Vim.
  * Only used when starting Vim on an empty file, without a file name.