mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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.
This commit is contained in:
@@ -4,6 +4,7 @@ int highest_patch __ARGS((void));
|
|||||||
int has_patch __ARGS((int n));
|
int has_patch __ARGS((int n));
|
||||||
void ex_version __ARGS((exarg_T *eap));
|
void ex_version __ARGS((exarg_T *eap));
|
||||||
void list_version __ARGS((void));
|
void list_version __ARGS((void));
|
||||||
|
void maybe_intro_message __ARGS((void));
|
||||||
void intro_message __ARGS((int colon));
|
void intro_message __ARGS((int colon));
|
||||||
void ex_intro __ARGS((exarg_T *eap));
|
void ex_intro __ARGS((exarg_T *eap));
|
||||||
/* vim: set ft=c : */
|
/* vim: set ft=c : */
|
||||||
|
15
src/screen.c
15
src/screen.c
@@ -389,7 +389,6 @@ redraw_asap(type)
|
|||||||
}
|
}
|
||||||
ret = 4;
|
ret = 4;
|
||||||
}
|
}
|
||||||
setcursor();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
vim_free(screenline);
|
vim_free(screenline);
|
||||||
@@ -405,6 +404,11 @@ redraw_asap(type)
|
|||||||
vim_free(screenline2);
|
vim_free(screenline2);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Show the intro message when appropriate. */
|
||||||
|
maybe_intro_message();
|
||||||
|
|
||||||
|
setcursor();
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -715,13 +719,8 @@ update_screen(type)
|
|||||||
showmode();
|
showmode();
|
||||||
|
|
||||||
/* May put up an introductory message when not editing a file */
|
/* May put up an introductory message when not editing a file */
|
||||||
if (!did_intro && bufempty()
|
if (!did_intro)
|
||||||
&& curbuf->b_fname == NULL
|
maybe_intro_message();
|
||||||
#ifdef FEAT_WINDOWS
|
|
||||||
&& firstwin->w_next == NULL
|
|
||||||
#endif
|
|
||||||
&& vim_strchr(p_shm, SHM_INTRO) == NULL)
|
|
||||||
intro_message(FALSE);
|
|
||||||
did_intro = TRUE;
|
did_intro = TRUE;
|
||||||
|
|
||||||
#ifdef FEAT_GUI
|
#ifdef FEAT_GUI
|
||||||
|
@@ -728,6 +728,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1306,
|
||||||
/**/
|
/**/
|
||||||
1305,
|
1305,
|
||||||
/**/
|
/**/
|
||||||
@@ -3776,6 +3778,21 @@ version_msg(s)
|
|||||||
|
|
||||||
static void do_intro_line __ARGS((int row, char_u *mesg, int add_version, int attr));
|
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.
|
* Give an introductory message about Vim.
|
||||||
* Only used when starting Vim on an empty file, without a file name.
|
* Only used when starting Vim on an empty file, without a file name.
|
||||||
|
Reference in New Issue
Block a user