From 854b0ac6e6d3deb8d5944cd0cb01f506d2d9dbdd Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mar 23 2010 23:12:26 +0000 Subject: - patchlevel 411 --- diff --git a/7.2.411 b/7.2.411 new file mode 100644 index 0000000..4a619ee --- /dev/null +++ b/7.2.411 @@ -0,0 +1,47 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.411 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.411 +Problem: When parsing 'cino' a comma isn't skipped properly. +Solution: Skip the comma. (Lech Lorens) +Files: src/misc1.c + + +*** ../vim-7.2.410/src/misc1.c 2010-03-02 12:37:01.000000000 +0100 +--- src/misc1.c 2010-03-23 18:18:15.000000000 +0100 +*************** +*** 6270,6275 **** +--- 6270,6277 ---- + case 'l': ind_keep_case_label = n; break; + case '#': ind_hash_comment = n; break; + } ++ if (*options == ',') ++ ++options; + } + + /* remember where the cursor was when we started */ +*** ../vim-7.2.410/src/version.c 2010-03-23 18:06:47.000000000 +0100 +--- src/version.c 2010-03-23 18:22:13.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 411, + /**/ + +-- +BRIDGEKEEPER: What is your favorite editor? +GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm! + "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE 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 5d109e2..b7fbf3b 100644 --- a/README.patches +++ b/README.patches @@ -442,3 +442,4 @@ Individual patches for Vim 7.2: 2152 7.2.408 ":g/the/s/a/b/" can set '[ and '] marks to an unchanged line 1814 7.2.409 summary of number of substitutes is incorrect for ":folddo" 2526 7.2.410 highlighting directories for completion doesn't work properly + 1462 7.2.411 when parsing 'cino' a comma isn't skipped properly diff --git a/vim.spec b/vim.spec index c9bddde..20f7b9a 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 410 +%define patchlevel 411 Summary: The VIM editor URL: http://www.vim.org/ @@ -476,6 +476,7 @@ Patch407: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.407 Patch408: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.408 Patch409: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.409 Patch410: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.410 +Patch411: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.411 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -1024,6 +1025,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch408 -p0 %patch409 -p0 %patch410 -p0 +%patch411 -p0 # install spell files @@ -1488,6 +1490,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Mar 24 2010 Karsten Hopp 7.2.411-1 +- patchlevel 411 + * Tue Mar 23 2010 Karsten Hopp 7.2.410-1 - patchlevel 410