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