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 0a75ab9..b7fbf3b 100644 --- a/README.patches +++ b/README.patches @@ -27,6 +27,7 @@ Collection of patches for Vim 7.2: 108889 7.2.001-100.gz patches 7.2.001 to 7.2.100, gzip'ed 208102 7.2.101-200.gz patches 7.2.101 to 7.2.200, gzip'ed 82163 7.2.201-300.gz patches 7.2.201 to 7.2.300, gzip'ed + 94475 7.2.301-400.gz patches 7.2.301 to 7.2.400, gzip'ed Individual patches for Vim 7.2: @@ -399,3 +400,46 @@ Individual patches for Vim 7.2: 3802 7.2.366 CTRL-B doesn't go back to the first line of the buffer 3236 7.2.367 "xxd -r -p" doesn't work as documented 1623 7.2.368 (after 7.2.361) append line with Ruby interface doesn't work + 1872 7.2.369 error message for :profile is not easy to understand + 4352 7.2.370 (after 7.2.356) a redraw may cause folds to be closed + 10029 7.2.371 build problems on Tandem NonStop + 9674 7.2.372 (extra) cross-compiling GvimExt and xxd doesn't work. + 2901 7.2.373 new messages from gcc 4.5 are not in 'errorformat' + 4434 7.2.374 Ruby eval() doesn't understand Vim types + 1794 7.2.375 ml_get errors when using ":bprevious" in a BufEnter autocmd + 1577 7.2.376 ml_get error when using SiSU syntax + 1983 7.2.377 (extra, after 7.2.372) small mistakes in Ming build file + 2832 7.2.378 C function declaration indented too much + 1758 7.2.379 'eventignore' is set to an invalid value inside ":doau" + 3699 7.2.380 (after 7.2.363) Perl builds with 5.10.1 but not with 5.10.0 + 6835 7.2.381 no completion for :behave + 1766 7.2.382 close cmdline window when 'bufhide' is "wipe" uses freed mem + 3021 7.2.383 Vim doesn't build cleanly with MSVC 2010 + 1849 7.2.384 (extra) Vim doesn't build properly with MSVC 2010 + 2147 7.2.385 can't drag status line when in the command line window + 2051 7.2.386 KDE 3.1 focus hack causes problems for other window managers + 8233 7.2.387 Ruby with MingW still doesn't build all versions + 2486 7.2.388 (extra part of 7.2.387) Ruby with MingW + 4805 7.2.389 synIDattr() cannot return the font + 2302 7.2.390 in some situations the popup menu can be displayed wrong + 3426 7.2.391 internal alloc(0) error when doing "CTRL-V $ c" + 4898 7.2.392 netbeans hangs reading from a socket at the maximum block size + 9605 7.2.393 Mac: Can't build with different Xcode developer tools dir + 4298 7.2.394 .lzma and .xz files are not supported + 1554 7.2.395 in help CTRL=] on g?g? escapes the ?, causing it to fail + 1554 7.2.396 get E38 errors + 1722 7.2.397 redundant check for w_lines_valid + 4127 7.2.398 when moving windows the cursor ends up in the wrong line + 1784 7.2.399 (extra, after 7.2.388) cannot compile on MingW + 12865 7.2.400 (after 7.2.387) Ruby problems with init and empty string + 1982 7.2.401 wildmode list doesn't highlight directory names with a space + 2649 7.2.402 error 705 when re-using funcref variable + 1548 7.2.403 (after 7.2.400) compiler warning for pointer type + 1880 7.2.404 pointers for composing characters are not properly initialized + 1636 7.2.405 with small features match is not highlighted for ":s/p/r/c" + 4701 7.2.406 (after 7.2.119) uninit memory read + 1916 7.2.407 when using :s with an expression backslashes are dropped + 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 79c662e..d332f5a 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 368 +%define patchlevel 411 Summary: The VIM editor URL: http://www.vim.org/ @@ -434,6 +434,49 @@ Patch365: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.365 Patch366: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.366 Patch367: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.367 Patch368: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.368 +Patch369: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.369 +Patch370: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.370 +Patch371: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.371 +Patch372: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.372 +Patch373: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.373 +Patch374: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.374 +Patch375: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.375 +Patch376: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.376 +Patch377: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.377 +Patch378: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.378 +Patch379: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.379 +Patch380: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.380 +Patch381: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.381 +Patch382: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.382 +Patch383: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.383 +Patch384: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.384 +Patch385: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.385 +Patch386: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.386 +Patch387: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.387 +Patch388: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.388 +Patch389: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.389 +Patch390: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.390 +Patch391: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.391 +Patch392: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.392 +Patch393: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.393 +Patch394: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.394 +Patch395: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.395 +Patch396: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.396 +Patch397: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.397 +Patch398: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.398 +Patch399: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.399 +Patch400: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.400 +Patch401: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.401 +Patch402: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.402 +Patch403: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.403 +Patch404: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.404 +Patch405: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.405 +Patch406: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.406 +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 @@ -940,6 +983,49 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch366 -p0 %patch367 -p0 %patch368 -p0 +%patch369 -p0 +%patch370 -p0 +%patch371 -p0 +%patch372 -p0 +%patch373 -p0 +%patch374 -p0 +%patch375 -p0 +%patch376 -p0 +%patch377 -p0 +%patch378 -p0 +%patch379 -p0 +%patch380 -p0 +%patch381 -p0 +%patch382 -p0 +%patch383 -p0 +%patch384 -p0 +%patch385 -p0 +%patch386 -p0 +%patch387 -p0 +%patch388 -p0 +%patch389 -p0 +%patch390 -p0 +%patch391 -p0 +%patch392 -p0 +%patch393 -p0 +%patch394 -p0 +%patch395 -p0 +%patch396 -p0 +%patch397 -p0 +%patch398 -p0 +%patch399 -p0 +%patch400 -p0 +%patch401 -p0 +%patch402 -p0 +%patch403 -p0 +%patch404 -p0 +%patch405 -p0 +%patch406 -p0 +%patch407 -p0 +%patch408 -p0 +%patch409 -p0 +%patch410 -p0 +%patch411 -p0 # install spell files @@ -1404,6 +1490,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Mar 26 2010 Karsten Hopp 7.2.411-1 +- patchlevel 411 + * Thu Feb 18 2010 Karsten Hopp 7.2.368-1 - patchlevel 368