839e7a7
To: vim-dev@vim.org
839e7a7
Subject: Patch 7.0.073
839e7a7
Fcc: outbox
839e7a7
From: Bram Moolenaar <Bram@moolenaar.net>
839e7a7
Mime-Version: 1.0
839e7a7
Content-Type: text/plain; charset=ISO-8859-1
839e7a7
Content-Transfer-Encoding: 8bit
839e7a7
------------
839e7a7
839e7a7
Patch 7.0.073
839e7a7
Problem:    Insert mode completion: Typing <CR> sometimes selects the original
839e7a7
	    text instead of keeping what was typed.  (Justin Constantino)
839e7a7
Solution:   Don't let <CR> select the original text if there is no popup menu.
839e7a7
Files:	    src/edit.c
839e7a7
839e7a7
839e7a7
*** ../vim-7.0.072/src/edit.c	Tue Aug 29 17:28:56 2006
839e7a7
--- src/edit.c	Tue Aug 29 17:40:06 2006
839e7a7
***************
839e7a7
*** 3097,3102 ****
839e7a7
--- 3097,3106 ----
839e7a7
  
839e7a7
      /* Show the popup menu with a different set of matches. */
839e7a7
      ins_compl_show_pum();
839e7a7
+ 
839e7a7
+     /* Don't let Enter select the original text when there is no popup menu. */
839e7a7
+     if (compl_match_array == NULL)
839e7a7
+ 	compl_enter_selects = FALSE;
839e7a7
  }
839e7a7
  
839e7a7
  /*
839e7a7
*** ../vim-7.0.072/src/version.c	Tue Aug 29 18:16:37 2006
839e7a7
--- src/version.c	Tue Aug 29 18:35:33 2006
839e7a7
***************
839e7a7
*** 668,669 ****
839e7a7
--- 668,671 ----
839e7a7
  {   /* Add new patch number below this line */
839e7a7
+ /**/
839e7a7
+     73,
839e7a7
  /**/
839e7a7
839e7a7
-- 
839e7a7
hundred-and-one symptoms of being an internet addict:
839e7a7
269. You wonder how you can make your dustbin produce Sesame Street's
839e7a7
     Oscar's the Garbage Monster song when you empty it.
839e7a7
839e7a7
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
839e7a7
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
839e7a7
\\\        download, build and distribute -- http://www.A-A-P.org        ///
839e7a7
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///