rpms/vim
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- patchlevel 359

Browse Source
This commit is contained in:
Karsten Hopp 2010-02-11 23:06:51 +00:00
parent 70cbd7556f
commit 710db57b85
3 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
7.2.359 Normal file
View File

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

2
README.patches
View File

@ -388,3 +388,5 @@ Individual patches for Vim 7.2:
2663 7.2.355 popup menu in wrong position when 'number' is set
2166 7.2.356 not all folds are closed when 'foldmethod' is changed
1565 7.2.357 CR displayed wrong when changing 'fileformat' from/to "mac"
2384 7.2.358 compiler warnings on VMS
1805 7.2.359 crash when using the Netbeans join command

9
vim.spec
View File

@ -18,7 +18,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim72%{?beta}
%define patchlevel 357
%define patchlevel 359
Summary: The VIM editor
URL: http://www.vim.org/
@ -423,6 +423,8 @@ Patch354: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.354
Patch355: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.355
Patch356: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.356
Patch357: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.357
Patch358: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.358
Patch359: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.359
Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
@ -918,6 +920,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch355 -p0
%patch356 -p0
%patch357 -p0
%patch358 -p0
%patch359 -p0
# install spell files
@ -1382,6 +1386,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Fri Feb 12 2010 Karsten Hopp <karsten@redhat.com> 7.2.359-1
- patchlevel 359
* Thu Feb 11 2010 Karsten Hopp <karsten@redhat.com> 7.2.357-1
- patchlevel 357