|
 |
dd421e8 |
To: vim_dev@googlegroups.com
|
|
|
dd421e8 |
Subject: Patch 7.3.404
|
|
|
dd421e8 |
Fcc: outbox
|
|
|
dd421e8 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
dd421e8 |
Mime-Version: 1.0
|
|
|
dd421e8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
dd421e8 |
Content-Transfer-Encoding: 8bit
|
|
|
dd421e8 |
------------
|
|
|
dd421e8 |
|
|
|
dd421e8 |
Patch 7.3.404
|
|
|
dd421e8 |
Problem: When a complete function uses refresh "always" redo will not work
|
|
|
dd421e8 |
properly.
|
|
|
dd421e8 |
Solution: Do not reset compl_leader when compl_opt_refresh_always is set.
|
|
|
dd421e8 |
(Yasuhiro Matsumoto)
|
|
|
dd421e8 |
Files: src/edit.c
|
|
|
dd421e8 |
|
|
|
dd421e8 |
|
|
|
dd421e8 |
*** ../vim-7.3.403/src/edit.c 2012-01-10 22:26:12.000000000 +0100
|
|
|
dd421e8 |
--- src/edit.c 2012-01-20 14:26:06.000000000 +0100
|
|
|
dd421e8 |
***************
|
|
|
dd421e8 |
*** 3465,3475 ****
|
|
|
dd421e8 |
if (ins_compl_need_restart())
|
|
|
dd421e8 |
ins_compl_restart();
|
|
|
dd421e8 |
|
|
|
dd421e8 |
! vim_free(compl_leader);
|
|
|
dd421e8 |
! compl_leader = vim_strnsave(ml_get_curline() + compl_col,
|
|
|
dd421e8 |
(int)(curwin->w_cursor.col - compl_col));
|
|
|
dd421e8 |
! if (compl_leader != NULL)
|
|
|
dd421e8 |
! ins_compl_new_leader();
|
|
|
dd421e8 |
}
|
|
|
dd421e8 |
|
|
|
dd421e8 |
/*
|
|
|
dd421e8 |
--- 3465,3481 ----
|
|
|
dd421e8 |
if (ins_compl_need_restart())
|
|
|
dd421e8 |
ins_compl_restart();
|
|
|
dd421e8 |
|
|
|
dd421e8 |
! /* When 'always' is set, don't reset compl_leader. While completing,
|
|
|
dd421e8 |
! * cursor don't point original position, changing compl_leader would
|
|
|
dd421e8 |
! * break redo. */
|
|
|
dd421e8 |
! if (!compl_opt_refresh_always)
|
|
|
dd421e8 |
! {
|
|
|
dd421e8 |
! vim_free(compl_leader);
|
|
|
dd421e8 |
! compl_leader = vim_strnsave(ml_get_curline() + compl_col,
|
|
|
dd421e8 |
(int)(curwin->w_cursor.col - compl_col));
|
|
|
dd421e8 |
! if (compl_leader != NULL)
|
|
|
dd421e8 |
! ins_compl_new_leader();
|
|
|
dd421e8 |
! }
|
|
|
dd421e8 |
}
|
|
|
dd421e8 |
|
|
|
dd421e8 |
/*
|
|
|
dd421e8 |
***************
|
|
|
dd421e8 |
*** 4554,4559 ****
|
|
|
dd421e8 |
--- 4560,4570 ----
|
|
|
dd421e8 |
int found_end = FALSE;
|
|
|
dd421e8 |
int advance;
|
|
|
dd421e8 |
|
|
|
dd421e8 |
+ /* When user complete function return -1 for findstart which is next
|
|
|
dd421e8 |
+ * time of 'always', compl_shown_match become NULL. */
|
|
|
dd421e8 |
+ if (compl_shown_match == NULL)
|
|
|
dd421e8 |
+ return -1;
|
|
|
dd421e8 |
+
|
|
|
dd421e8 |
if (compl_leader != NULL
|
|
|
dd421e8 |
&& (compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0)
|
|
|
dd421e8 |
{
|
|
|
dd421e8 |
*** ../vim-7.3.403/src/version.c 2012-01-20 13:39:03.000000000 +0100
|
|
|
dd421e8 |
--- src/version.c 2012-01-20 14:31:26.000000000 +0100
|
|
|
dd421e8 |
***************
|
|
|
dd421e8 |
*** 716,717 ****
|
|
|
dd421e8 |
--- 716,719 ----
|
|
|
dd421e8 |
{ /* Add new patch number below this line */
|
|
|
dd421e8 |
+ /**/
|
|
|
dd421e8 |
+ 404,
|
|
|
dd421e8 |
/**/
|
|
|
dd421e8 |
|
|
|
dd421e8 |
--
|
|
|
dd421e8 |
ARTHUR: I've said I'm sorry about the old woman, but from the behind you
|
|
|
dd421e8 |
looked ...
|
|
|
dd421e8 |
DENNIS: What I object to is that you automatically treat me like an inferior...
|
|
|
dd421e8 |
ARTHUR: Well ... I AM king.
|
|
|
dd421e8 |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
dd421e8 |
|
|
|
dd421e8 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
dd421e8 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
dd421e8 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
dd421e8 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|