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 4ba1bcd966a40ba9128a11d28611ba47c0bbf8b5..6720cdfc13da748546ecefcfd2835ee7ce501d08 100644 (file)
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -256,7 +256,7 @@ EX(CMD_copy,                "copy",         ex_copymove,
 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 f8795fa164f605df7b76e2c9c9a3587997eb6cce..dbb058444e759ce593a997bdc968aca938610e13 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6226,7 +6226,31 @@ parse_compl_arg(value, vallen, complp, argt, compl_arg)
 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 d286522fa319f69e89dcce1583db77a5c4db60f5..e02b9006899fb01e323e32de038c6599a8540ec9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    424,
 /**/
     423,
 /**/