Blame SOURCES/7.4.590

22c937
To: vim_dev@googlegroups.com
22c937
Subject: Patch 7.4.590
22c937
Fcc: outbox
22c937
From: Bram Moolenaar <Bram@moolenaar.net>
22c937
Mime-Version: 1.0
22c937
Content-Type: text/plain; charset=UTF-8
22c937
Content-Transfer-Encoding: 8bit
22c937
------------
22c937
22c937
Patch 7.4.590
22c937
Problem:    Using ctrl_x_mode as if it contains flags.
22c937
Solution:   Don't use AND with CTRL_X_OMNI. (Hirohito Higashi)
22c937
Files:	    src/edit.c
22c937
22c937
22c937
*** ../vim-7.4.589/src/edit.c	2014-11-12 18:59:17.602000656 +0100
22c937
--- src/edit.c	2015-01-20 19:43:45.376745467 +0100
22c937
***************
22c937
*** 3394,3400 ****
22c937
       * allow the word to be deleted, we won't match everything. */
22c937
      if ((int)(p - line) - (int)compl_col < 0
22c937
  	    || ((int)(p - line) - (int)compl_col == 0
22c937
! 		&& (ctrl_x_mode & CTRL_X_OMNI) == 0))
22c937
  	return K_BS;
22c937
  
22c937
      /* Deleted more than what was used to find matches or didn't finish
22c937
--- 3394,3400 ----
22c937
       * allow the word to be deleted, we won't match everything. */
22c937
      if ((int)(p - line) - (int)compl_col < 0
22c937
  	    || ((int)(p - line) - (int)compl_col == 0
22c937
! 		&& ctrl_x_mode != CTRL_X_OMNI))
22c937
  	return K_BS;
22c937
  
22c937
      /* Deleted more than what was used to find matches or didn't finish
22c937
*** ../vim-7.4.589/src/version.c	2015-01-20 19:39:31.655524020 +0100
22c937
--- src/version.c	2015-01-22 22:40:04.297786215 +0100
22c937
***************
22c937
*** 743,744 ****
22c937
--- 743,746 ----
22c937
  {   /* Add new patch number below this line */
22c937
+ /**/
22c937
+     590,
22c937
  /**/
22c937
22c937
-- 
22c937
Laughing helps. It's like jogging on the inside.
22c937
22c937
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
22c937
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
22c937
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
22c937
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///