To: vim-dev@vim.org
Subject: Patch 6.1.222
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.222 (depends on 6.1.219)
Problem:    Patch 6.1.219 was incomplete.
Solution:   Add the changes for ":amenu".
Files:	    src/menu.c


*** ../vim61.221/src/menu.c	Sun Oct 13 20:08:14 2002
--- src/menu.c	Sun Oct 13 15:43:15 2002
***************
*** 742,752 ****
  
  		if (c)
  		{
! 		    menu->strings[i] = alloc((unsigned)(STRLEN(call_data) + 2));
  		    if (menu->strings[i] != NULL)
  		    {
  			menu->strings[i][0] = c;
  			STRCPY(menu->strings[i] + 1, call_data);
  		    }
  		}
  		else
--- 742,761 ----
  
  		if (c)
  		{
! 		    menu->strings[i] = alloc((unsigned)(STRLEN(call_data) + 4));
  		    if (menu->strings[i] != NULL)
  		    {
  			menu->strings[i][0] = c;
  			STRCPY(menu->strings[i] + 1, call_data);
+ 			if (c == Ctrl_C)
+ 			{
+ 			    int	    len = STRLEN(menu->strings[i]);
+ 
+ 			    /* Append CTRL-\ CTRL-G to obey 'insertmode'. */
+ 			    menu->strings[i][len] = Ctrl_BSL;
+ 			    menu->strings[i][len + 1] = Ctrl_G;
+ 			    menu->strings[i][len + 2] = NUL;
+ 			}
  		    }
  		}
  		else
*** ../vim61.221/src/version.c	Sun Oct 13 20:08:14 2002
--- src/version.c	Sun Oct 13 20:11:31 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     222,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
213. Your kids start referring to you as "that guy in front of the monitor."

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///          Creator of Vim - Vi IMproved -- http://www.vim.org          \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///