mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
updated for version 7.2.424
Problem: ":colorscheme" without an argument doesn't do anything. Solution: Make it echo the current color scheme name. (partly by Christian Brabandt)
This commit is contained in:
@@ -256,7 +256,7 @@ EX(CMD_copy, "copy", ex_copymove,
|
|||||||
EX(CMD_colder, "colder", qf_age,
|
EX(CMD_colder, "colder", qf_age,
|
||||||
RANGE|NOTADR|COUNT|TRLBAR),
|
RANGE|NOTADR|COUNT|TRLBAR),
|
||||||
EX(CMD_colorscheme, "colorscheme", ex_colorscheme,
|
EX(CMD_colorscheme, "colorscheme", ex_colorscheme,
|
||||||
NEEDARG|WORD1|TRLBAR|CMDWIN),
|
WORD1|TRLBAR|CMDWIN),
|
||||||
EX(CMD_command, "command", ex_command,
|
EX(CMD_command, "command", ex_command,
|
||||||
EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN),
|
EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN),
|
||||||
EX(CMD_comclear, "comclear", ex_comclear,
|
EX(CMD_comclear, "comclear", ex_comclear,
|
||||||
|
@@ -6226,7 +6226,31 @@ parse_compl_arg(value, vallen, complp, argt, compl_arg)
|
|||||||
ex_colorscheme(eap)
|
ex_colorscheme(eap)
|
||||||
exarg_T *eap;
|
exarg_T *eap;
|
||||||
{
|
{
|
||||||
if (load_colors(eap->arg) == FAIL)
|
if (*eap->arg == NUL)
|
||||||
|
{
|
||||||
|
#ifdef FEAT_EVAL
|
||||||
|
char_u *expr = vim_strsave((char_u *)"g:colors_name");
|
||||||
|
char_u *p = NULL;
|
||||||
|
|
||||||
|
if (expr != NULL)
|
||||||
|
{
|
||||||
|
++emsg_off;
|
||||||
|
p = eval_to_string(expr, NULL, FALSE);
|
||||||
|
--emsg_off;
|
||||||
|
vim_free(expr);
|
||||||
|
}
|
||||||
|
if (p != NULL)
|
||||||
|
{
|
||||||
|
MSG(p);
|
||||||
|
vim_free(p);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
MSG("default");
|
||||||
|
#else
|
||||||
|
MSG(_("unknown"));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else if (load_colors(eap->arg) == FAIL)
|
||||||
EMSG2(_("E185: Cannot find color scheme %s"), eap->arg);
|
EMSG2(_("E185: Cannot find color scheme %s"), eap->arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -681,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 */
|
||||||
|
/**/
|
||||||
|
424,
|
||||||
/**/
|
/**/
|
||||||
423,
|
423,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user