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

- patchlevel 356

Browse Source
This commit is contained in:
Karsten Hopp 2010-02-03 23:09:15 +00:00
parent 70209da525
commit 7368090312
3 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
7.2.356 Normal file
View File

@ -0,0 +1,69 @@
To: vim-dev@vim.org
Subject: Patch 7.2.356
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.356
Problem: When 'foldmethod' is changed not all folds are closed as expected.
Solution: In foldUpdate() correct the start position and reset fd_flags when
w_foldinvalid is set. (Lech Lorens)
Files: src/fold.c
*** ../vim-7.2.355/src/fold.c 2010-01-19 17:24:20.000000000 +0100
--- src/fold.c 2010-02-03 18:08:11.000000000 +0100
***************
*** 849,859 ****
fold_T *fp;
/* Mark all folds from top to bot as maybe-small. */
! (void)foldFind(&curwin->w_folds, curwin->w_cursor.lnum, &fp);
while (fp < (fold_T *)curwin->w_folds.ga_data + curwin->w_folds.ga_len
&& fp->fd_top < bot)
{
fp->fd_small = MAYBE;
++fp;
}
--- 849,865 ----
fold_T *fp;
/* Mark all folds from top to bot as maybe-small. */
! (void)foldFind(&curwin->w_folds, top, &fp);
while (fp < (fold_T *)curwin->w_folds.ga_data + curwin->w_folds.ga_len
&& fp->fd_top < bot)
{
fp->fd_small = MAYBE;
+
+ /* Not sure if this is the right place to reset fd_flags (suggested by
+ * Lech Lorens). */
+ if (wp->w_foldinvalid)
+ fp->fd_flags = FD_LEVEL;
+
++fp;
}
*** ../vim-7.2.355/src/version.c 2010-02-03 17:42:59.000000000 +0100
--- src/version.c 2010-02-03 18:12:34.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
{ /* Add new patch number below this line */
+ /**/
+ 356,
/**/
--
hundred-and-one symptoms of being an internet addict:
190. You quickly hand over your wallet, leather jacket, and car keys
during a mugging, then proceed to beat the crap out of your
assailant when he asks for your laptop.
/// 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

@ -385,3 +385,5 @@ Individual patches for Vim 7.2:
1825 7.2.352 Win64: Vim doesn't work when cross-compiled with MingW libs
4764 7.2.353 no command line completion for ":profile"
2270 7.2.354 Japanese single-width double-byte chars not handled correctly
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

9
vim.spec
View File

@ -18,7 +18,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim72%{?beta}
%define patchlevel 354
%define patchlevel 356
Summary: The VIM editor
URL: http://www.vim.org/
@ -420,6 +420,8 @@ Patch351: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.351
Patch352: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.352
Patch353: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.353
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
Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
@ -912,6 +914,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch352 -p0
%patch353 -p0
%patch354 -p0
%patch355 -p0
%patch356 -p0
# install spell files
@ -1376,6 +1380,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Thu Feb 04 2010 Karsten Hopp <karsten@redhat.com> 7.2.356-1
- patchlevel 356
* Wed Feb 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.354-1
- patchlevel 354