mirror of
git://slackware.nl/current.git
synced 2025-02-15 08:50:09 +01:00
9664bee729
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
191 lines
5 KiB
Text
191 lines
5 KiB
Text
To: vim_dev@googlegroups.com
|
|
Subject: Patch 7.3.462
|
|
Fcc: outbox
|
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
Mime-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
------------
|
|
|
|
Patch 7.3.462
|
|
Problem: When using ":loadview" folds may be closed unexpectedly.
|
|
Solution: Take into account foldlevel. (Xavier de Gaye)
|
|
Files: src/fold.c
|
|
|
|
|
|
*** ../vim-7.3.461/src/fold.c 2012-01-10 22:26:12.000000000 +0100
|
|
--- src/fold.c 2012-02-29 19:18:07.000000000 +0100
|
|
***************
|
|
*** 3292,3298 ****
|
|
/* put_folds() {{{2 */
|
|
#if defined(FEAT_SESSION) || defined(PROTO)
|
|
static int put_folds_recurse __ARGS((FILE *fd, garray_T *gap, linenr_T off));
|
|
! static int put_foldopen_recurse __ARGS((FILE *fd, garray_T *gap, linenr_T off));
|
|
|
|
/*
|
|
* Write commands to "fd" to restore the manual folds in window "wp".
|
|
--- 3292,3299 ----
|
|
/* put_folds() {{{2 */
|
|
#if defined(FEAT_SESSION) || defined(PROTO)
|
|
static int put_folds_recurse __ARGS((FILE *fd, garray_T *gap, linenr_T off));
|
|
! static int put_foldopen_recurse __ARGS((FILE *fd, win_T *wp, garray_T *gap, linenr_T off));
|
|
! static int put_fold_open_close __ARGS((FILE *fd, fold_T *fp, linenr_T off));
|
|
|
|
/*
|
|
* Write commands to "fd" to restore the manual folds in window "wp".
|
|
***************
|
|
*** 3312,3318 ****
|
|
|
|
/* If some folds are manually opened/closed, need to restore that. */
|
|
if (wp->w_fold_manual)
|
|
! return put_foldopen_recurse(fd, &wp->w_folds, (linenr_T)0);
|
|
|
|
return OK;
|
|
}
|
|
--- 3313,3319 ----
|
|
|
|
/* If some folds are manually opened/closed, need to restore that. */
|
|
if (wp->w_fold_manual)
|
|
! return put_foldopen_recurse(fd, wp, &wp->w_folds, (linenr_T)0);
|
|
|
|
return OK;
|
|
}
|
|
***************
|
|
*** 3352,3363 ****
|
|
* Returns FAIL when writing failed.
|
|
*/
|
|
static int
|
|
! put_foldopen_recurse(fd, gap, off)
|
|
FILE *fd;
|
|
garray_T *gap;
|
|
linenr_T off;
|
|
{
|
|
int i;
|
|
fold_T *fp;
|
|
|
|
fp = (fold_T *)gap->ga_data;
|
|
--- 3353,3366 ----
|
|
* Returns FAIL when writing failed.
|
|
*/
|
|
static int
|
|
! put_foldopen_recurse(fd, wp, gap, off)
|
|
FILE *fd;
|
|
+ win_T *wp;
|
|
garray_T *gap;
|
|
linenr_T off;
|
|
{
|
|
int i;
|
|
+ int level;
|
|
fold_T *fp;
|
|
|
|
fp = (fold_T *)gap->ga_data;
|
|
***************
|
|
*** 3367,3393 ****
|
|
{
|
|
if (fp->fd_nested.ga_len > 0)
|
|
{
|
|
! /* open/close nested folds while this fold is open */
|
|
if (fprintf(fd, "%ld", fp->fd_top + off) < 0
|
|
|| put_eol(fd) == FAIL
|
|
|| put_line(fd, "normal zo") == FAIL)
|
|
return FAIL;
|
|
! if (put_foldopen_recurse(fd, &fp->fd_nested, off + fp->fd_top)
|
|
== FAIL)
|
|
return FAIL;
|
|
}
|
|
- if (fprintf(fd, "%ld", fp->fd_top + off) < 0
|
|
- || put_eol(fd) == FAIL
|
|
- || fprintf(fd, "normal z%c",
|
|
- fp->fd_flags == FD_CLOSED ? 'c' : 'o') < 0
|
|
- || put_eol(fd) == FAIL)
|
|
- return FAIL;
|
|
}
|
|
++fp;
|
|
}
|
|
|
|
return OK;
|
|
}
|
|
#endif /* FEAT_SESSION */
|
|
|
|
/* }}}1 */
|
|
--- 3370,3429 ----
|
|
{
|
|
if (fp->fd_nested.ga_len > 0)
|
|
{
|
|
! /* open nested folds while this fold is open */
|
|
if (fprintf(fd, "%ld", fp->fd_top + off) < 0
|
|
|| put_eol(fd) == FAIL
|
|
|| put_line(fd, "normal zo") == FAIL)
|
|
return FAIL;
|
|
! if (put_foldopen_recurse(fd, wp, &fp->fd_nested,
|
|
! off + fp->fd_top)
|
|
== FAIL)
|
|
return FAIL;
|
|
+ /* close the parent when needed */
|
|
+ if (fp->fd_flags == FD_CLOSED)
|
|
+ {
|
|
+ if (put_fold_open_close(fd, fp, off) == FAIL)
|
|
+ return FAIL;
|
|
+ }
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ /* Open or close the leaf according to the window foldlevel.
|
|
+ * Do not close a leaf that is already closed, as it will close
|
|
+ * the parent. */
|
|
+ level = foldLevelWin(wp, off + fp->fd_top);
|
|
+ if ((fp->fd_flags == FD_CLOSED && wp->w_p_fdl >= level)
|
|
+ || (fp->fd_flags != FD_CLOSED && wp->w_p_fdl < level))
|
|
+ if (put_fold_open_close(fd, fp, off) == FAIL)
|
|
+ return FAIL;
|
|
}
|
|
}
|
|
++fp;
|
|
}
|
|
|
|
return OK;
|
|
}
|
|
+
|
|
+ /* put_fold_open_close() {{{2 */
|
|
+ /*
|
|
+ * Write the open or close command to "fd".
|
|
+ * Returns FAIL when writing failed.
|
|
+ */
|
|
+ static int
|
|
+ put_fold_open_close(fd, fp, off)
|
|
+ FILE *fd;
|
|
+ fold_T *fp;
|
|
+ linenr_T off;
|
|
+ {
|
|
+ if (fprintf(fd, "%ld", fp->fd_top + off) < 0
|
|
+ || put_eol(fd) == FAIL
|
|
+ || fprintf(fd, "normal z%c",
|
|
+ fp->fd_flags == FD_CLOSED ? 'c' : 'o') < 0
|
|
+ || put_eol(fd) == FAIL)
|
|
+ return FAIL;
|
|
+
|
|
+ return OK;
|
|
+ }
|
|
#endif /* FEAT_SESSION */
|
|
|
|
/* }}}1 */
|
|
*** ../vim-7.3.461/src/version.c 2012-02-29 18:22:03.000000000 +0100
|
|
--- src/version.c 2012-02-29 18:40:43.000000000 +0100
|
|
***************
|
|
*** 716,717 ****
|
|
--- 716,719 ----
|
|
{ /* Add new patch number below this line */
|
|
+ /**/
|
|
+ 462,
|
|
/**/
|
|
|
|
--
|
|
~
|
|
~
|
|
~
|
|
".signature" 4 lines, 50 characters written
|
|
|
|
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|