|
 |
9831e6b |
To: vim-dev@vim.org
|
|
|
9831e6b |
Subject: Patch 7.0.154
|
|
|
9831e6b |
Fcc: outbox
|
|
|
9831e6b |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
9831e6b |
Mime-Version: 1.0
|
|
|
9831e6b |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
9831e6b |
Content-Transfer-Encoding: 8bit
|
|
|
9831e6b |
------------
|
|
|
9831e6b |
|
|
|
9831e6b |
Patch 7.0.154
|
|
|
9831e6b |
Problem: When 'foldnextmax' is negative Vim can hang. (James Vega)
|
|
|
9831e6b |
Solution: Avoid the fold level becoming negative.
|
|
|
9831e6b |
Files: src/fold.c, src/syntax.c
|
|
|
9831e6b |
|
|
|
9831e6b |
|
|
|
9831e6b |
*** ../vim-7.0.153/src/fold.c Sun Apr 23 00:31:04 2006
|
|
|
9831e6b |
--- src/fold.c Sun Oct 29 20:23:21 2006
|
|
|
9831e6b |
***************
|
|
|
9831e6b |
*** 2971,2977 ****
|
|
|
9831e6b |
--- 2971,2981 ----
|
|
|
9831e6b |
else
|
|
|
9831e6b |
flp->lvl = get_indent_buf(buf, lnum) / buf->b_p_sw;
|
|
|
9831e6b |
if (flp->lvl > flp->wp->w_p_fdn)
|
|
|
9831e6b |
+ {
|
|
|
9831e6b |
flp->lvl = flp->wp->w_p_fdn;
|
|
|
9831e6b |
+ if (flp->lvl < 0)
|
|
|
9831e6b |
+ flp->lvl = 0;
|
|
|
9831e6b |
+ }
|
|
|
9831e6b |
}
|
|
|
9831e6b |
|
|
|
9831e6b |
/* foldlevelDiff() {{{2 */
|
|
|
9831e6b |
*** ../vim-7.0.153/src/syntax.c Tue Oct 3 17:04:21 2006
|
|
|
9831e6b |
--- src/syntax.c Sun Oct 29 20:21:27 2006
|
|
|
9831e6b |
***************
|
|
|
9831e6b |
*** 6072,6078 ****
|
|
|
9831e6b |
--- 6072,6082 ----
|
|
|
9831e6b |
++level;
|
|
|
9831e6b |
}
|
|
|
9831e6b |
if (level > wp->w_p_fdn)
|
|
|
9831e6b |
+ {
|
|
|
9831e6b |
level = wp->w_p_fdn;
|
|
|
9831e6b |
+ if (level < 0)
|
|
|
9831e6b |
+ level = 0;
|
|
|
9831e6b |
+ }
|
|
|
9831e6b |
return level;
|
|
|
9831e6b |
}
|
|
|
9831e6b |
#endif
|
|
|
9831e6b |
*** ../vim-7.0.153/src/version.c Mon Oct 30 22:31:30 2006
|
|
|
9831e6b |
--- src/version.c Wed Nov 1 12:41:14 2006
|
|
|
9831e6b |
***************
|
|
|
9831e6b |
*** 668,669 ****
|
|
|
9831e6b |
--- 668,671 ----
|
|
|
9831e6b |
{ /* Add new patch number below this line */
|
|
|
9831e6b |
+ /**/
|
|
|
9831e6b |
+ 154,
|
|
|
9831e6b |
/**/
|
|
|
9831e6b |
|
|
|
9831e6b |
--
|
|
|
9831e6b |
hundred-and-one symptoms of being an internet addict:
|
|
|
9831e6b |
134. You consider bandwidth to be more important than carats.
|
|
|
9831e6b |
|
|
|
9831e6b |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
9831e6b |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
9831e6b |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
9831e6b |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|