|
 |
710db57 |
To: vim-dev@vim.org
|
|
|
710db57 |
Subject: Patch 7.2.359
|
|
|
710db57 |
Fcc: outbox
|
|
|
710db57 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
710db57 |
Mime-Version: 1.0
|
|
|
710db57 |
Content-Type: text/plain; charset=UTF-8
|
|
|
710db57 |
Content-Transfer-Encoding: 8bit
|
|
|
710db57 |
------------
|
|
|
710db57 |
|
|
|
710db57 |
Patch 7.2.359
|
|
|
710db57 |
Problem: Crash when using the Netbeans join command.
|
|
|
710db57 |
Solution: Make sure the ml_flush_line() function is not used recursively.
|
|
|
710db57 |
(Xavier de Gaye)
|
|
|
710db57 |
Files: src/memline.c
|
|
|
710db57 |
|
|
|
710db57 |
|
|
|
710db57 |
*** ../vim-7.2.358/src/memline.c 2009-11-17 17:13:03.000000000 +0100
|
|
|
710db57 |
--- src/memline.c 2010-02-11 18:47:48.000000000 +0100
|
|
|
710db57 |
***************
|
|
|
710db57 |
*** 3087,3098 ****
|
|
|
710db57 |
--- 3087,3105 ----
|
|
|
710db57 |
int start;
|
|
|
710db57 |
int count;
|
|
|
710db57 |
int i;
|
|
|
710db57 |
+ static int entered = FALSE;
|
|
|
710db57 |
|
|
|
710db57 |
if (buf->b_ml.ml_line_lnum == 0 || buf->b_ml.ml_mfp == NULL)
|
|
|
710db57 |
return; /* nothing to do */
|
|
|
710db57 |
|
|
|
710db57 |
if (buf->b_ml.ml_flags & ML_LINE_DIRTY)
|
|
|
710db57 |
{
|
|
|
710db57 |
+ /* This code doesn't work recursively, but Netbeans may call back here
|
|
|
710db57 |
+ * when obtaining the cursor position. */
|
|
|
710db57 |
+ if (entered)
|
|
|
710db57 |
+ return;
|
|
|
710db57 |
+ entered = TRUE;
|
|
|
710db57 |
+
|
|
|
710db57 |
lnum = buf->b_ml.ml_line_lnum;
|
|
|
710db57 |
new_line = buf->b_ml.ml_line_ptr;
|
|
|
710db57 |
|
|
|
710db57 |
***************
|
|
|
710db57 |
*** 3160,3165 ****
|
|
|
710db57 |
--- 3167,3174 ----
|
|
|
710db57 |
}
|
|
|
710db57 |
}
|
|
|
710db57 |
vim_free(new_line);
|
|
|
710db57 |
+
|
|
|
710db57 |
+ entered = FALSE;
|
|
|
710db57 |
}
|
|
|
710db57 |
|
|
|
710db57 |
buf->b_ml.ml_line_lnum = 0;
|
|
|
710db57 |
*** ../vim-7.2.358/src/version.c 2010-02-11 18:19:32.000000000 +0100
|
|
|
710db57 |
--- src/version.c 2010-02-11 18:53:55.000000000 +0100
|
|
|
710db57 |
***************
|
|
|
710db57 |
*** 683,684 ****
|
|
|
710db57 |
--- 683,686 ----
|
|
|
710db57 |
{ /* Add new patch number below this line */
|
|
|
710db57 |
+ /**/
|
|
|
710db57 |
+ 359,
|
|
|
710db57 |
/**/
|
|
|
710db57 |
|
|
|
710db57 |
--
|
|
|
710db57 |
Your fault: core dumped
|
|
|
710db57 |
|
|
|
710db57 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
710db57 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
710db57 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
710db57 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|