diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-05-05 17:18:41 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-05-05 17:18:41 +0200 |
| commit | 89c79b99328b66f77f1d12dc8c6701dfe2c57f15 (patch) | |
| tree | bbb6dedac5f7f54db8c050873375b9973d19c520 | |
| parent | cefe4f994853c2d4866e2aa4ea3e3f36ab2fea13 (diff) | |
| download | vim-89c79b99328b66f77f1d12dc8c6701dfe2c57f15.zip | |
patch 7.4.1818
Problem: Help completion adds @en to all matches except the first one.
Solution: Remove "break", go over all items.
| -rw-r--r-- | src/ex_getln.c | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 11824907e..26fed5972 100644 --- 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 **file) 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 **file) 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 **file) && 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 index 79ca5cdc7..1045c21ec 100644 --- 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, |