# HG changeset patch # User Christian Brabandt # Date 1462462207 -7200 # Node ID c7bdd383275d96c6d656935d6e91c3c4ab57ca9c # Parent 3e45c2f5262b91378cb2358837e1d4f10b6a4c3e commit https://github.com/vim/vim/commit/89c79b99328b66f77f1d12dc8c6701dfe2c57f15 Author: Bram Moolenaar Date: Thu May 5 17:18:41 2016 +0200 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 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -3189,8 +3189,9 @@ cmdline_del(int from) #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 @@ cleanup_help_tags(int num_file, char_u * 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 @@ cleanup_help_tags(int num_file, char_u * 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 @@ cleanup_help_tags(int num_file, char_u * && 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; - } } } } diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1818, +/**/ 1817, /**/ 1816,