updated for version 7.3.514
Problem: No completion for :history command.
Solution: Add the completion and update the docs. Also fix ":behave"
completion. (Dominique Pelle)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 133fa7d..44b61df 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3920,8 +3920,16 @@
#endif
case CMD_behave:
xp->xp_context = EXPAND_BEHAVE;
+ xp->xp_pattern = arg;
break;
+#if defined(FEAT_CMDHIST)
+ case CMD_history:
+ xp->xp_context = EXPAND_HISTORY;
+ xp->xp_pattern = arg;
+ break;
+#endif
+
#endif /* FEAT_CMDL_COMPL */
default:
@@ -5329,6 +5337,7 @@
} command_complete[] =
{
{EXPAND_AUGROUP, "augroup"},
+ {EXPAND_BEHAVE, "behave"},
{EXPAND_BUFFERS, "buffer"},
{EXPAND_COLORS, "color"},
{EXPAND_COMMANDS, "command"},
@@ -5350,8 +5359,11 @@
{EXPAND_FUNCTIONS, "function"},
{EXPAND_HELP, "help"},
{EXPAND_HIGHLIGHT, "highlight"},
+#if defined(FEAT_CMDHIST)
+ {EXPAND_HISTORY, "history"},
+#endif
#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
- && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
+ && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
{EXPAND_LOCALES, "locale"},
#endif
{EXPAND_MAPPINGS, "mapping"},
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 38775af..3d0c26f 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -25,7 +25,7 @@
int cmdlen; /* number of chars in command line */
int cmdpos; /* current cursor position */
int cmdspos; /* cursor column on screen */
- int cmdfirstc; /* ':', '/', '?', '=' or NUL */
+ int cmdfirstc; /* ':', '/', '?', '=', '>' or NUL */
int cmdindent; /* number of spaces before cmdline */
char_u *cmdprompt; /* message in front of cmdline */
int cmdattr; /* attributes for prompt */
@@ -111,6 +111,9 @@
#ifdef FEAT_CMDL_COMPL
static int expand_shellcmd __ARGS((char_u *filepat, int *num_file, char_u ***file, int flagsarg));
static int ExpandRTDir __ARGS((char_u *pat, int *num_file, char_u ***file, char *dirname[]));
+# ifdef FEAT_CMDHIST
+static char_u *get_history_arg __ARGS((expand_T *xp, int idx));
+# endif
# if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
static int ExpandUserDefined __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file));
static int ExpandUserList __ARGS((expand_T *xp, int *num_file, char_u ***file));
@@ -4628,6 +4631,9 @@
{
{EXPAND_COMMANDS, get_command_name, FALSE, TRUE},
{EXPAND_BEHAVE, get_behave_arg, TRUE, TRUE},
+#ifdef FEAT_CMDHIST
+ {EXPAND_HISTORY, get_history_arg, TRUE, TRUE},
+#endif
#ifdef FEAT_USR_CMDS
{EXPAND_USER_COMMANDS, get_user_commands, FALSE, TRUE},
{EXPAND_USER_CMD_FLAGS, get_user_cmd_flags, FALSE, TRUE},
@@ -5245,6 +5251,34 @@
NULL
};
+#if defined(FEAT_CMDL_COMPL) || defined(PROTO)
+/*
+ * Function given to ExpandGeneric() to obtain the possible first
+ * arguments of the ":history command.
+ */
+ static char_u *
+get_history_arg(xp, idx)
+ expand_T *xp UNUSED;
+ int idx;
+{
+ static char_u compl[2] = { NUL, NUL };
+ char *short_names = ":=@>?/";
+ int short_names_count = STRLEN(short_names);
+ int history_name_count = sizeof(history_names) / sizeof(char *) - 1;
+
+ if (idx < short_names_count)
+ {
+ compl[0] = (char_u)short_names[idx];
+ return compl;
+ }
+ if (idx < short_names_count + history_name_count)
+ return (char_u *)history_names[idx - short_names_count];
+ if (idx == short_names_count + history_name_count)
+ return (char_u *)"all";
+ return NULL;
+}
+#endif
+
/*
* init_history() - Initialize the command line history.
* Also used to re-allocate the history when the size changes.
diff --git a/src/version.c b/src/version.c
index de24ff4..e5a7fd9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 514,
+/**/
513,
/**/
512,
diff --git a/src/vim.h b/src/vim.h
index b67702b..5cd5e30 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -781,6 +781,7 @@
#define EXPAND_FILES_IN_PATH 38
#define EXPAND_OWNSYNTAX 39
#define EXPAND_LOCALES 40
+#define EXPAND_HISTORY 41
/* Values for exmode_active (0 is no exmode) */
#define EXMODE_NORMAL 1