diff --git a/7.1.228 b/7.1.228 new file mode 100644 index 0000000..bab4dff --- /dev/null +++ b/7.1.228 @@ -0,0 +1,51 @@ +To: vim-dev@vim.org +Subject: Patch 7.1.228 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.1.228 +Problem: When 'foldmethod' is "indent" and a fold is created with ">>" it + can't be closed with "zc". (Daniel Shahaf) +Solution: Reset the "small" flag of a fold when adding a line to it. +Files: src/fold.c + + +*** ../vim-7.1.227/src/fold.c Sun Oct 14 15:32:10 2007 +--- src/fold.c Sun Jan 13 21:26:48 2008 +*************** +*** 2676,2681 **** +--- 2676,2682 ---- + if (fp->fd_len < flp->lnum - fp->fd_top) + { + fp->fd_len = flp->lnum - fp->fd_top; ++ fp->fd_small = MAYBE; + fold_changed = TRUE; + } + +*** ../vim-7.1.227/src/version.c Sun Jan 13 17:39:29 2008 +--- src/version.c Sun Jan 13 21:56:53 2008 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 228, + /**/ + +-- +VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur + and his knights seemed hopeless, when, suddenly ... the animator + suffered a fatal heart attack. +ANIMATOR: Aaaaagh! +VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could + continue. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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 /// diff --git a/README.patches b/README.patches index fc5825a..4abc6c5 100644 --- a/README.patches +++ b/README.patches @@ -245,3 +245,17 @@ Individual patches for Vim 7.1: 1491 7.1.212 accessing a byte before a line 1750 7.1.213 aborting ":tabedit" from the ATTENTION dialog leaves tab open 8399 7.1.214 ":1s/g\n\zs1//" deletes characters from the first line + 6476 7.1.215 it's difficult to figure out the nesting of syntax items + 2360 7.1.216 variants of --remote-tab are not mentioned for "vim --help" + 7103 7.1.217 the "help-tags" tag may be missing from runtime/doc/tags + 1864 7.1.218 syntax region without "keepend" could be truncated + 12134 7.1.219 (after 7.1.215) synstack() doesn't work for one char region + 3928 7.1.220 cursor may end up on trail byte after ")" + 1978 7.1.221 when inserting a "(" the following highlighting may be wrong + 3531 7.1.222 (after 7.1.217) wildcards of ":helptags" are not expanded + 8138 7.1.223 glob() doesn't handle "'" when 'shell' is "sh" or "bash" + 2131 7.1.224 "vim -F -o one two" sets 'rightleft' in one window only + 1767 7.1.225 using unitialized value when XGetWMNormalHints() fails + 1957 7.1.226 command line completion fails for a file name with a '&' char + 5595 7.1.227 hang in syntax HL when moving over a ")" + 1678 7.1.228 with 'foldmethod' "indent" fold can't be closed after "3>>" diff --git a/vim.spec b/vim.spec index 164608e..65567e6 100644 --- a/vim.spec +++ b/vim.spec @@ -1,6 +1,8 @@ # used for CVS snapshots: %define CVSDATE %{nil} +%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 +%endif %define desktop_file 1 %if %{desktop_file} %define desktop_file_utils_version 0.2.93 @@ -15,7 +17,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim71%{?beta} -%define patchlevel 214 +%define patchlevel 228 Summary: The VIM editor URL: http://www.vim.org/ @@ -265,6 +267,20 @@ Patch211: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.211 Patch212: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.212 Patch213: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.213 Patch214: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.214 +Patch215: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.215 +Patch216: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.216 +Patch217: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.217 +Patch218: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.218 +Patch219: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.219 +Patch220: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.220 +Patch221: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.221 +Patch222: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.222 +Patch223: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.223 +Patch224: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.224 +Patch225: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.225 +Patch226: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.226 +Patch227: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.227 +Patch228: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.228 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -608,9 +624,23 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch209 -p0 %patch210 -p0 %patch211 -p0 -%patch212 -p0 -%patch213 -p0 -%patch214 -p0 +%patch212 -p0 +%patch213 -p0 +%patch214 -p0 +%patch215 -p0 +%patch216 -p0 +%patch217 -p0 +%patch218 -p0 +%patch219 -p0 +%patch220 -p0 +%patch221 -p0 +%patch222 -p0 +%patch223 -p0 +%patch224 -p0 +%patch225 -p0 +%patch226 -p0 +%patch227 -p0 +%patch228 -p0 # install spell files @@ -997,6 +1027,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Jan 14 2008 Karsten Hopp 7.1.228-1 +- patchlevel 228 +- allow overwriting WITH_SELING at build time (#427710) + * Thu Jan 10 2008 Karsten Hopp 7.1.214-1 - patchlevel 214