Skip to content

Commit 235e463

Browse files
committed
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.
1 parent fbdc3f8 commit 235e463

File tree

3 files changed

+25
-8
lines changed

3 files changed

+25
-8
lines changed

src/proto/version.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ int highest_patch __ARGS((void));
44
int has_patch __ARGS((int n));
55
void ex_version __ARGS((exarg_T *eap));
66
void list_version __ARGS((void));
7+
void maybe_intro_message __ARGS((void));
78
void intro_message __ARGS((int colon));
89
void ex_intro __ARGS((exarg_T *eap));
910
/* vim: set ft=c : */

src/screen.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ redraw_asap(type)
389389
}
390390
ret = 4;
391391
}
392-
setcursor();
393392
}
394393

395394
vim_free(screenline);
@@ -405,6 +404,11 @@ redraw_asap(type)
405404
vim_free(screenline2);
406405
#endif
407406

407+
/* Show the intro message when appropriate. */
408+
maybe_intro_message();
409+
410+
setcursor();
411+
408412
return ret;
409413
}
410414

@@ -715,13 +719,8 @@ update_screen(type)
715719
showmode();
716720

717721
/* May put up an introductory message when not editing a file */
718-
if (!did_intro && bufempty()
719-
&& curbuf->b_fname == NULL
720-
#ifdef FEAT_WINDOWS
721-
&& firstwin->w_next == NULL
722-
#endif
723-
&& vim_strchr(p_shm, SHM_INTRO) == NULL)
724-
intro_message(FALSE);
722+
if (!did_intro)
723+
maybe_intro_message();
725724
did_intro = TRUE;
726725

727726
#ifdef FEAT_GUI

src/version.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,8 @@ static char *(features[]) =
728728

729729
static int included_patches[] =
730730
{ /* Add new patch number below this line */
731+
/**/
732+
1306,
731733
/**/
732734
1305,
733735
/**/
@@ -3776,6 +3778,21 @@ version_msg(s)
37763778

37773779
static void do_intro_line __ARGS((int row, char_u *mesg, int add_version, int attr));
37783780

3781+
/*
3782+
* Show the intro message when not editing a file.
3783+
*/
3784+
void
3785+
maybe_intro_message()
3786+
{
3787+
if (bufempty()
3788+
&& curbuf->b_fname == NULL
3789+
#ifdef FEAT_WINDOWS
3790+
&& firstwin->w_next == NULL
3791+
#endif
3792+
&& vim_strchr(p_shm, SHM_INTRO) == NULL)
3793+
intro_message(FALSE);
3794+
}
3795+
37793796
/*
37803797
* Give an introductory message about Vim.
37813798
* Only used when starting Vim on an empty file, without a file name.

0 commit comments

Comments
 (0)