patch 7.4.1818
Problem: Help completion adds @en to all matches except the first one.
Solution: Remove "break", go over all items.
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 1182490..26fed59 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3189,8 +3189,9 @@
#endif
/*
- * this function is called when the screen size changes and with incremental
- * search
+ * This function is called when the screen size changes and with incremental
+ * search and in other situations where the command line may have been
+ * overwritten.
*/
void
redrawcmdline(void)
@@ -4505,7 +4506,7 @@
char_u buf[4];
char_u *p = buf;
- if (p_hlg[0] != NUL)
+ if (p_hlg[0] != NUL && (p_hlg[0] != 'e' || p_hlg[1] != 'n'))
{
*p++ = '@';
*p++ = p_hlg[0];
@@ -4518,10 +4519,10 @@
len = (int)STRLEN(file[i]) - 3;
if (len <= 0)
continue;
- if (i == 0 && STRCMP(file[i] + len, buf) == 0)
+ if (STRCMP(file[i] + len, buf) == 0)
{
+ /* remove the default language */
file[i][len] = NUL;
- break;
}
else if (STRCMP(file[i] + len, "@en") == 0)
{
@@ -4533,10 +4534,8 @@
&& STRNCMP(file[i], file[j], len + 1) == 0)
break;
if (j == num_file)
- {
+ /* item only exists with @en, remove it */
file[i][len] = NUL;
- break;
- }
}
}
}