[vim] 136/139: patch 7.4.1818 Problem: Help completion adds @en to all matches except the first one. Solution: Remove "break", go over all items.

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 89c79b99328b66f77f1d12dc8c6701dfe2c57f15
Author: Bram Moolenaar <Bram at vim.org>
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.
---
 src/ex_getln.c | 15 +++++++--------
 src/version.c  |  2 ++
 2 files changed, 9 insertions(+), 8 deletions(-)

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 @@ 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 79ca5cd..1045c21 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git