mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.2-286
This commit is contained in:
parent
76675565ac
commit
ef94eec644
@ -5869,6 +5869,7 @@ showcmd Compiled with 'showcmd' support.
|
|||||||
signs Compiled with |:sign| support.
|
signs Compiled with |:sign| support.
|
||||||
smartindent Compiled with 'smartindent' support.
|
smartindent Compiled with 'smartindent' support.
|
||||||
sniff Compiled with SNiFF interface support.
|
sniff Compiled with SNiFF interface support.
|
||||||
|
startuptime Compiled with |--startuptime| support.
|
||||||
statusline Compiled with support for 'statusline', 'rulerformat'
|
statusline Compiled with support for 'statusline', 'rulerformat'
|
||||||
and special formats of 'titlestring' and 'iconstring'.
|
and special formats of 'titlestring' and 'iconstring'.
|
||||||
sun_workshop Compiled with support for Sun |workshop|.
|
sun_workshop Compiled with support for Sun |workshop|.
|
||||||
|
@ -144,12 +144,13 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
|
|||||||
-u NORC no yes
|
-u NORC no yes
|
||||||
--noplugin yes no
|
--noplugin yes no
|
||||||
|
|
||||||
--startuptime={fname} *--startuptime*
|
--startuptime {fname} *--startuptime*
|
||||||
During startup write timing messages to the file {fname}.
|
During startup write timing messages to the file {fname}.
|
||||||
This can be used to find out where time is spent while loading
|
This can be used to find out where time is spent while loading
|
||||||
your .vimrc and plugins.
|
your .vimrc, plugins and opening the first file.
|
||||||
When {fname} already exists new messages are appended.
|
When {fname} already exists new messages are appended.
|
||||||
{only when compiled with this feature}
|
(Only available when compiled with the |+startuptime|
|
||||||
|
feature).
|
||||||
|
|
||||||
*--literal*
|
*--literal*
|
||||||
--literal Take file names literally, don't expand wildcards. Not needed
|
--literal Take file names literally, don't expand wildcards. Not needed
|
||||||
|
@ -374,6 +374,7 @@ N *+scrollbind* |'scrollbind'|
|
|||||||
B *+signs* |:sign|
|
B *+signs* |:sign|
|
||||||
N *+smartindent* |'smartindent'|
|
N *+smartindent* |'smartindent'|
|
||||||
m *+sniff* SniFF interface |sniff|
|
m *+sniff* SniFF interface |sniff|
|
||||||
|
N *+startuptime* |--startuptime| argument
|
||||||
N *+statusline* Options 'statusline', 'rulerformat' and special
|
N *+statusline* Options 'statusline', 'rulerformat' and special
|
||||||
formats of 'titlestring' and 'iconstring'
|
formats of 'titlestring' and 'iconstring'
|
||||||
m *+sun_workshop* |workshop|
|
m *+sun_workshop* |workshop|
|
||||||
|
@ -11736,6 +11736,9 @@ f_has(argvars, rettv)
|
|||||||
#ifdef FEAT_SNIFF
|
#ifdef FEAT_SNIFF
|
||||||
"sniff",
|
"sniff",
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef STARTUPTIME
|
||||||
|
"startuptime",
|
||||||
|
#endif
|
||||||
#ifdef FEAT_STL_OPT
|
#ifdef FEAT_STL_OPT
|
||||||
"statusline",
|
"statusline",
|
||||||
#endif
|
#endif
|
||||||
|
25
src/main.c
25
src/main.c
@ -204,9 +204,9 @@ main
|
|||||||
#ifdef STARTUPTIME
|
#ifdef STARTUPTIME
|
||||||
for (i = 1; i < argc; ++i)
|
for (i = 1; i < argc; ++i)
|
||||||
{
|
{
|
||||||
if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
|
if (STRICMP(argv[i], "--startuptime") == 0 && i + 1 < argc)
|
||||||
{
|
{
|
||||||
time_fd = mch_fopen(argv[i] + 14, "a");
|
time_fd = mch_fopen(argv[i + 1], "a");
|
||||||
TIME_MSG("--- VIM STARTING ---");
|
TIME_MSG("--- VIM STARTING ---");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -1726,6 +1726,11 @@ command_line_scan(parmp)
|
|||||||
want_argument = TRUE;
|
want_argument = TRUE;
|
||||||
argv_idx += 3;
|
argv_idx += 3;
|
||||||
}
|
}
|
||||||
|
else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
|
||||||
|
{
|
||||||
|
want_argument = TRUE;
|
||||||
|
argv_idx += 11;
|
||||||
|
}
|
||||||
#ifdef FEAT_CLIENTSERVER
|
#ifdef FEAT_CLIENTSERVER
|
||||||
else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0)
|
else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0)
|
||||||
; /* already processed -- no arg */
|
; /* already processed -- no arg */
|
||||||
@ -1761,10 +1766,6 @@ command_line_scan(parmp)
|
|||||||
/* already processed, skip */
|
/* already processed, skip */
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
|
|
||||||
{
|
|
||||||
/* already processed, skip */
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (argv[0][argv_idx])
|
if (argv[0][argv_idx])
|
||||||
@ -2061,7 +2062,7 @@ command_line_scan(parmp)
|
|||||||
mainerr(ME_GARBAGE, (char_u *)argv[0]);
|
mainerr(ME_GARBAGE, (char_u *)argv[0]);
|
||||||
|
|
||||||
--argc;
|
--argc;
|
||||||
if (argc < 1 && c != 'S')
|
if (argc < 1 && c != 'S') /* -S has an optional argument */
|
||||||
mainerr_arg_missing((char_u *)argv[0]);
|
mainerr_arg_missing((char_u *)argv[0]);
|
||||||
++argv;
|
++argv;
|
||||||
argv_idx = -1;
|
argv_idx = -1;
|
||||||
@ -2102,11 +2103,16 @@ command_line_scan(parmp)
|
|||||||
(char_u *)argv[0];
|
(char_u *)argv[0];
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case '-': /* "--cmd {command}" execute command */
|
case '-':
|
||||||
|
if (argv[-1][2] == 'c')
|
||||||
|
{
|
||||||
|
/* "--cmd {command}" execute command */
|
||||||
if (parmp->n_pre_commands >= MAX_ARG_CMDS)
|
if (parmp->n_pre_commands >= MAX_ARG_CMDS)
|
||||||
mainerr(ME_EXTRA_CMD, NULL);
|
mainerr(ME_EXTRA_CMD, NULL);
|
||||||
parmp->pre_commands[parmp->n_pre_commands++] =
|
parmp->pre_commands[parmp->n_pre_commands++] =
|
||||||
(char_u *)argv[0];
|
(char_u *)argv[0];
|
||||||
|
}
|
||||||
|
/* "--startuptime <file>" already handled */
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* case 'd': -d {device} is handled in mch_check_win() for the
|
/* case 'd': -d {device} is handled in mch_check_win() for the
|
||||||
@ -3144,6 +3150,9 @@ usage()
|
|||||||
main_msg(_("--serverlist\t\tList available Vim server names and exit"));
|
main_msg(_("--serverlist\t\tList available Vim server names and exit"));
|
||||||
main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
|
main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef STARTUPTIME
|
||||||
|
main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
|
||||||
|
#endif
|
||||||
#ifdef FEAT_VIMINFO
|
#ifdef FEAT_VIMINFO
|
||||||
main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
|
main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
|
||||||
#endif
|
#endif
|
||||||
|
@ -494,6 +494,11 @@ static char *(features[]) =
|
|||||||
#else
|
#else
|
||||||
"-sniff",
|
"-sniff",
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef STARTUPTIME
|
||||||
|
"+startuptime",
|
||||||
|
#else
|
||||||
|
"-startuptime",
|
||||||
|
#endif
|
||||||
#ifdef FEAT_STL_OPT
|
#ifdef FEAT_STL_OPT
|
||||||
"+statusline",
|
"+statusline",
|
||||||
#else
|
#else
|
||||||
@ -676,6 +681,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 */
|
||||||
|
/**/
|
||||||
|
286,
|
||||||
/**/
|
/**/
|
||||||
285,
|
285,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user