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)
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 4ba1bcd..6720cdf 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -256,7 +256,7 @@
EX(CMD_colder, "colder", qf_age,
RANGE|NOTADR|COUNT|TRLBAR),
EX(CMD_colorscheme, "colorscheme", ex_colorscheme,
- NEEDARG|WORD1|TRLBAR|CMDWIN),
+ WORD1|TRLBAR|CMDWIN),
EX(CMD_command, "command", ex_command,
EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN),
EX(CMD_comclear, "comclear", ex_comclear,
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index f8795fa..dbb0584 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6226,7 +6226,31 @@
ex_colorscheme(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);
}
diff --git a/src/version.c b/src/version.c
index d286522..e02b900 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 424,
+/**/
423,
/**/
422,
