thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 7.4.1818

Browse Source 
Problem:    Help completion adds @en to all matches except the first one.
Solution:   Remove "break", go over all items.
This commit is contained in:
Bram Moolenaar 2016-05-05 17:18:41 +02:00
parent cefe4f9948
commit 89c79b9932
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ex_getln.c
View File

@ -3189,8 +3189,9 @@ cmdline_del(int from)
#endif #endif
/* /*
* this function is called when the screen size changes and with incremental * This function is called when the screen size changes and with incremental
* search * search and in other situations where the command line may have been
* overwritten.
*/ */
void void
redrawcmdline(void) redrawcmdline(void)
@ -4505,7 +4506,7 @@ cleanup_help_tags(int num_file, char_u **file)
char_u buf[4]; char_u buf[4];
char_u *p = buf; 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++ = p_hlg[0]; *p++ = p_hlg[0];
@ -4518,10 +4519,10 @@ cleanup_help_tags(int num_file, char_u **file)
len = (int)STRLEN(file[i]) - 3; len = (int)STRLEN(file[i]) - 3;
if (len <= 0) if (len <= 0)
continue; 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; file[i][len] = NUL;
break;
} }
else if (STRCMP(file[i] + len, "@en") == 0) 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) && STRNCMP(file[i], file[j], len + 1) == 0)
break; break;
if (j == num_file) if (j == num_file)
{ /* item only exists with @en, remove it */
file[i][len] = NUL; file[i][len] = NUL;
break;
}
} }
} }
} }

2
src/version.c
View File

@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1818,
/**/ /**/
1817, 1817,
/**/ /**/