To: vim_dev@googlegroups.com
Subject: Patch 7.4.1818
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.1818
Problem:    Help completion adds @en to all matches except the first one.
Solution:   Remove "break", go over all items.
Files:      src/ex_getln.c


*** ../vim-7.4.1817/src/ex_getln.c	2016-03-28 19:58:59.155781382 +0200
--- src/ex_getln.c	2016-05-05 17:16:37.817306285 +0200
***************
*** 3189,3196 ****
  #endif
  
  /*
!  * this function is called when the screen size changes and with incremental
!  * search
   */
      void
  redrawcmdline(void)
--- 3189,3197 ----
  #endif
  
  /*
!  * 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,4511 ****
      char_u	buf[4];
      char_u	*p = buf;
  
!     if (p_hlg[0] != NUL)
      {
  	*p++ = '@';
  	*p++ = p_hlg[0];
--- 4506,4512 ----
      char_u	buf[4];
      char_u	*p = buf;
  
!     if (p_hlg[0] != NUL && (p_hlg[0] != 'e' || p_hlg[1] != 'n'))
      {
  	*p++ = '@';
  	*p++ = p_hlg[0];
***************
*** 4518,4527 ****
  	len = (int)STRLEN(file[i]) - 3;
  	if (len <= 0)
  	    continue;
! 	if (i == 0 && STRCMP(file[i] + len, buf) == 0)
  	{
  	    file[i][len] = NUL;
- 	    break;
  	}
  	else if (STRCMP(file[i] + len, "@en") == 0)
  	{
--- 4519,4528 ----
  	len = (int)STRLEN(file[i]) - 3;
  	if (len <= 0)
  	    continue;
! 	if (STRCMP(file[i] + len, buf) == 0)
  	{
+ 	    /* remove the default language */
  	    file[i][len] = NUL;
  	}
  	else if (STRCMP(file[i] + len, "@en") == 0)
  	{
***************
*** 4533,4542 ****
  			&& STRNCMP(file[i], file[j], len + 1) == 0)
  		    break;
  	    if (j == num_file)
! 	    {
  		file[i][len] = NUL;
- 		break;
- 	    }
  	}
      }
  }
--- 4534,4541 ----
  			&& STRNCMP(file[i], file[j], len + 1) == 0)
  		    break;
  	    if (j == num_file)
! 		/* item only exists with @en, remove it */
  		file[i][len] = NUL;
  	}
      }
  }
*** ../vim-7.4.1817/src/version.c	2016-05-04 21:49:15.004075133 +0200
--- src/version.c	2016-05-05 17:17:50.420479043 +0200
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     1818,
  /**/

-- 
   [The rest of the ARMY stand around looking at a loss.]
INSPECTOR END OF FILM: (picks up megaphone) All right!  Clear off!  Go on!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///