summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_docmd.c15
-rw-r--r--src/version.c2
2 files changed, 15 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 1598d893e..b9ec6c530 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3861,13 +3861,24 @@ set_one_cmd_context(xp, buff)
#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
case CMD_language:
- if (*skiptowhite(arg) == NUL)
+ p = skiptowhite(arg);
+ if (*p == NUL)
{
xp->xp_context = EXPAND_LANGUAGE;
xp->xp_pattern = arg;
}
else
- xp->xp_context = EXPAND_NOTHING;
+ {
+ if ( STRNCMP(arg, "messages", p - arg) == 0
+ || STRNCMP(arg, "ctype", p - arg) == 0
+ || STRNCMP(arg, "time", p - arg) == 0)
+ {
+ xp->xp_context = EXPAND_LOCALES;
+ xp->xp_pattern = skipwhite(p);
+ }
+ else
+ xp->xp_context = EXPAND_NOTHING;
+ }
break;
#endif
#if defined(FEAT_PROFILE)
diff --git a/src/version.c b/src/version.c
index 0136d6117..14537c6f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 200,
+/**/
199,
/**/
198,