|
 |
23bda8d |
To: vim-dev@vim.org
|
|
|
23bda8d |
Subject: Patch 7.2.305
|
|
|
23bda8d |
Fcc: outbox
|
|
|
23bda8d |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
23bda8d |
Mime-Version: 1.0
|
|
|
23bda8d |
Content-Type: text/plain; charset=UTF-8
|
|
|
23bda8d |
Content-Transfer-Encoding: 8bit
|
|
|
23bda8d |
------------
|
|
|
23bda8d |
|
|
|
23bda8d |
Patch 7.2.305
|
|
|
23bda8d |
Problem: Recursively redrawing causes a memory leak. (Dominique Pelle)
|
|
|
23bda8d |
Solution: Disallow recursive screen updating.
|
|
|
23bda8d |
Files: src/screen.c
|
|
|
23bda8d |
|
|
|
23bda8d |
|
|
|
23bda8d |
*** ../vim-7.2.304/src/screen.c 2009-11-11 17:07:25.000000000 +0100
|
|
|
23bda8d |
--- src/screen.c 2009-11-17 16:30:53.000000000 +0100
|
|
|
23bda8d |
***************
|
|
|
23bda8d |
*** 323,328 ****
|
|
|
23bda8d |
--- 323,329 ----
|
|
|
23bda8d |
int did_one;
|
|
|
23bda8d |
#endif
|
|
|
23bda8d |
|
|
|
23bda8d |
+ /* Don't do anything if the screen structures are (not yet) valid. */
|
|
|
23bda8d |
if (!screen_valid(TRUE))
|
|
|
23bda8d |
return;
|
|
|
23bda8d |
|
|
|
23bda8d |
***************
|
|
|
23bda8d |
*** 342,348 ****
|
|
|
23bda8d |
if (curwin->w_lines_valid == 0 && type < NOT_VALID)
|
|
|
23bda8d |
type = NOT_VALID;
|
|
|
23bda8d |
|
|
|
23bda8d |
! if (!redrawing())
|
|
|
23bda8d |
{
|
|
|
23bda8d |
redraw_later(type); /* remember type for next time */
|
|
|
23bda8d |
must_redraw = type;
|
|
|
23bda8d |
--- 343,351 ----
|
|
|
23bda8d |
if (curwin->w_lines_valid == 0 && type < NOT_VALID)
|
|
|
23bda8d |
type = NOT_VALID;
|
|
|
23bda8d |
|
|
|
23bda8d |
! /* Postpone the redrawing when it's not needed and when being called
|
|
|
23bda8d |
! * recursively. */
|
|
|
23bda8d |
! if (!redrawing() || updating_screen)
|
|
|
23bda8d |
{
|
|
|
23bda8d |
redraw_later(type); /* remember type for next time */
|
|
|
23bda8d |
must_redraw = type;
|
|
|
23bda8d |
***************
|
|
|
23bda8d |
*** 582,587 ****
|
|
|
23bda8d |
--- 585,591 ----
|
|
|
23bda8d |
|
|
|
23bda8d |
/*
|
|
|
23bda8d |
* Prepare for updating one or more windows.
|
|
|
23bda8d |
+ * Caller must check for "updating_screen" already set to avoid recursiveness.
|
|
|
23bda8d |
*/
|
|
|
23bda8d |
static void
|
|
|
23bda8d |
update_prepare()
|
|
|
23bda8d |
***************
|
|
|
23bda8d |
*** 663,669 ****
|
|
|
23bda8d |
doit = TRUE;
|
|
|
23bda8d |
}
|
|
|
23bda8d |
|
|
|
23bda8d |
! if (!doit)
|
|
|
23bda8d |
return;
|
|
|
23bda8d |
|
|
|
23bda8d |
/* update all windows that need updating */
|
|
|
23bda8d |
--- 667,675 ----
|
|
|
23bda8d |
doit = TRUE;
|
|
|
23bda8d |
}
|
|
|
23bda8d |
|
|
|
23bda8d |
! /* Return when there is nothing to do or screen updating already
|
|
|
23bda8d |
! * happening. */
|
|
|
23bda8d |
! if (!doit || updating_screen)
|
|
|
23bda8d |
return;
|
|
|
23bda8d |
|
|
|
23bda8d |
/* update all windows that need updating */
|
|
|
23bda8d |
***************
|
|
|
23bda8d |
*** 696,701 ****
|
|
|
23bda8d |
--- 702,711 ----
|
|
|
23bda8d |
updateWindow(wp)
|
|
|
23bda8d |
win_T *wp;
|
|
|
23bda8d |
{
|
|
|
23bda8d |
+ /* return if already busy updating */
|
|
|
23bda8d |
+ if (updating_screen)
|
|
|
23bda8d |
+ return;
|
|
|
23bda8d |
+
|
|
|
23bda8d |
update_prepare();
|
|
|
23bda8d |
|
|
|
23bda8d |
#ifdef FEAT_CLIPBOARD
|
|
|
23bda8d |
*** ../vim-7.2.304/src/version.c 2009-11-25 12:38:49.000000000 +0100
|
|
|
23bda8d |
--- src/version.c 2009-11-25 13:01:48.000000000 +0100
|
|
|
23bda8d |
***************
|
|
|
23bda8d |
*** 683,684 ****
|
|
|
23bda8d |
--- 683,686 ----
|
|
|
23bda8d |
{ /* Add new patch number below this line */
|
|
|
23bda8d |
+ /**/
|
|
|
23bda8d |
+ 305,
|
|
|
23bda8d |
/**/
|
|
|
23bda8d |
|
|
|
23bda8d |
--
|
|
|
23bda8d |
If the Universe is constantly expanding, why can't I ever find a parking space?
|
|
|
23bda8d |
|
|
|
23bda8d |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
23bda8d |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
23bda8d |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
23bda8d |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|