|
 |
ad77be0 |
To: vim-dev@vim.org
|
|
|
ad77be0 |
Subject: Patch 7.2.078
|
|
|
ad77be0 |
Fcc: outbox
|
|
|
ad77be0 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
ad77be0 |
Mime-Version: 1.0
|
|
|
ad77be0 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
ad77be0 |
Content-Transfer-Encoding: 8bit
|
|
|
ad77be0 |
------------
|
|
|
ad77be0 |
|
|
|
ad77be0 |
Patch 7.2.078
|
|
|
ad77be0 |
Problem: When deleting a fold that is specified with markers the cursor
|
|
|
ad77be0 |
position may be wrong. Folds may not be displayed properly after
|
|
|
ad77be0 |
a delete. Wrong fold may be deleted.
|
|
|
ad77be0 |
Solution: Fix the problems. (mostly by Lech Lorens)
|
|
|
ad77be0 |
Files: src/fold.c
|
|
|
ad77be0 |
|
|
|
ad77be0 |
|
|
|
ad77be0 |
*** ../vim-7.2.077/src/fold.c Fri Nov 28 21:26:50 2008
|
|
|
ad77be0 |
--- src/fold.c Tue Jan 6 14:53:26 2009
|
|
|
ad77be0 |
***************
|
|
|
ad77be0 |
*** 740,746 ****
|
|
|
ad77be0 |
garray_T *found_ga;
|
|
|
ad77be0 |
fold_T *found_fp = NULL;
|
|
|
ad77be0 |
linenr_T found_off = 0;
|
|
|
ad77be0 |
! int use_level = FALSE;
|
|
|
ad77be0 |
int maybe_small = FALSE;
|
|
|
ad77be0 |
int level = 0;
|
|
|
ad77be0 |
linenr_T lnum = start;
|
|
|
ad77be0 |
--- 740,746 ----
|
|
|
ad77be0 |
garray_T *found_ga;
|
|
|
ad77be0 |
fold_T *found_fp = NULL;
|
|
|
ad77be0 |
linenr_T found_off = 0;
|
|
|
ad77be0 |
! int use_level;
|
|
|
ad77be0 |
int maybe_small = FALSE;
|
|
|
ad77be0 |
int level = 0;
|
|
|
ad77be0 |
linenr_T lnum = start;
|
|
|
ad77be0 |
***************
|
|
|
ad77be0 |
*** 757,762 ****
|
|
|
ad77be0 |
--- 757,763 ----
|
|
|
ad77be0 |
gap = &curwin->w_folds;
|
|
|
ad77be0 |
found_ga = NULL;
|
|
|
ad77be0 |
lnum_off = 0;
|
|
|
ad77be0 |
+ use_level = FALSE;
|
|
|
ad77be0 |
for (;;)
|
|
|
ad77be0 |
{
|
|
|
ad77be0 |
if (!foldFind(gap, lnum - lnum_off, &fp))
|
|
|
ad77be0 |
***************
|
|
|
ad77be0 |
*** 783,802 ****
|
|
|
ad77be0 |
else
|
|
|
ad77be0 |
{
|
|
|
ad77be0 |
lnum = found_fp->fd_top + found_fp->fd_len + found_off;
|
|
|
ad77be0 |
- did_one = TRUE;
|
|
|
ad77be0 |
|
|
|
ad77be0 |
if (foldmethodIsManual(curwin))
|
|
|
ad77be0 |
deleteFoldEntry(found_ga,
|
|
|
ad77be0 |
(int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
|
|
|
ad77be0 |
else
|
|
|
ad77be0 |
{
|
|
|
ad77be0 |
! if (found_fp->fd_top + found_off < first_lnum)
|
|
|
ad77be0 |
! first_lnum = found_fp->fd_top;
|
|
|
ad77be0 |
! if (lnum > last_lnum)
|
|
|
ad77be0 |
last_lnum = lnum;
|
|
|
ad77be0 |
! parseMarker(curwin);
|
|
|
ad77be0 |
deleteFoldMarkers(found_fp, recursive, found_off);
|
|
|
ad77be0 |
}
|
|
|
ad77be0 |
|
|
|
ad77be0 |
/* redraw window */
|
|
|
ad77be0 |
changed_window_setting();
|
|
|
ad77be0 |
--- 784,804 ----
|
|
|
ad77be0 |
else
|
|
|
ad77be0 |
{
|
|
|
ad77be0 |
lnum = found_fp->fd_top + found_fp->fd_len + found_off;
|
|
|
ad77be0 |
|
|
|
ad77be0 |
if (foldmethodIsManual(curwin))
|
|
|
ad77be0 |
deleteFoldEntry(found_ga,
|
|
|
ad77be0 |
(int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
|
|
|
ad77be0 |
else
|
|
|
ad77be0 |
{
|
|
|
ad77be0 |
! if (first_lnum > found_fp->fd_top + found_off)
|
|
|
ad77be0 |
! first_lnum = found_fp->fd_top + found_off;
|
|
|
ad77be0 |
! if (last_lnum < lnum)
|
|
|
ad77be0 |
last_lnum = lnum;
|
|
|
ad77be0 |
! if (!did_one)
|
|
|
ad77be0 |
! parseMarker(curwin);
|
|
|
ad77be0 |
deleteFoldMarkers(found_fp, recursive, found_off);
|
|
|
ad77be0 |
}
|
|
|
ad77be0 |
+ did_one = TRUE;
|
|
|
ad77be0 |
|
|
|
ad77be0 |
/* redraw window */
|
|
|
ad77be0 |
changed_window_setting();
|
|
|
ad77be0 |
***************
|
|
|
ad77be0 |
*** 811,816 ****
|
|
|
ad77be0 |
--- 813,822 ----
|
|
|
ad77be0 |
redraw_curbuf_later(INVERTED);
|
|
|
ad77be0 |
#endif
|
|
|
ad77be0 |
}
|
|
|
ad77be0 |
+ else
|
|
|
ad77be0 |
+ /* Deleting markers may make cursor column invalid. */
|
|
|
ad77be0 |
+ check_cursor_col();
|
|
|
ad77be0 |
+
|
|
|
ad77be0 |
if (last_lnum > 0)
|
|
|
ad77be0 |
changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L);
|
|
|
ad77be0 |
}
|
|
|
ad77be0 |
*** ../vim-7.2.077/src/version.c Wed Dec 31 16:20:54 2008
|
|
|
ad77be0 |
--- src/version.c Tue Jan 6 15:00:36 2009
|
|
|
ad77be0 |
***************
|
|
|
ad77be0 |
*** 678,679 ****
|
|
|
ad77be0 |
--- 678,681 ----
|
|
|
ad77be0 |
{ /* Add new patch number below this line */
|
|
|
ad77be0 |
+ /**/
|
|
|
ad77be0 |
+ 78,
|
|
|
ad77be0 |
/**/
|
|
|
ad77be0 |
|
|
|
ad77be0 |
--
|
|
|
ad77be0 |
Looking at Perl through Lisp glasses, Perl looks atrocious.
|
|
|
ad77be0 |
|
|
|
ad77be0 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
ad77be0 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
ad77be0 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
ad77be0 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|