patch 8.1.1251: no test for completion of mapping keys
Problem: No test for completion of mapping keys.
Solution: Add a test. Also clean up the code.
diff --git a/src/term.c b/src/term.c
index 6fa519b..08a5563 100644
--- a/src/term.c
+++ b/src/term.c
@@ -6629,22 +6629,20 @@
#if defined(FEAT_CMDL_COMPL) || defined(PROTO)
/*
* Translate an internal mapping/abbreviation representation into the
- * corresponding external one recognized by :map/:abbrev commands;
- * respects the current B/k/< settings of 'cpoption'.
+ * corresponding external one recognized by :map/:abbrev commands.
+ * Respects the current B/k/< settings of 'cpoption'.
*
* This function is called when expanding mappings/abbreviations on the
- * command-line, and for building the "Ambiguous mapping..." error message.
+ * command-line.
*
- * It uses a growarray to build the translation string since the
- * latter can be wider than the original description. The caller has to
- * free the string afterwards.
+ * It uses a growarray to build the translation string since the latter can be
+ * wider than the original description. The caller has to free the string
+ * afterwards.
*
* Returns NULL when there is a problem.
*/
char_u *
-translate_mapping(
- char_u *str,
- int expmap) /* TRUE when expanding mappings on command-line */
+translate_mapping(char_u *str)
{
garray_T ga;
int c;
@@ -6691,7 +6689,7 @@
}
if (c == K_SPECIAL && str[1] != NUL && str[2] != NUL)
{
- if (expmap && cpo_special)
+ if (cpo_special)
{
ga_clear(&ga);
return NULL;
@@ -6703,7 +6701,7 @@
}
if (IS_SPECIAL(c) || modifiers) /* special key */
{
- if (expmap && cpo_special)
+ if (cpo_special)
{
ga_clear(&ga);
return NULL;