From 4e066c341c4037dd10bb16767556ee907d7760c4 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mar 19 2010 23:12:01 +0000 Subject: - patchlevel 403 --- diff --git a/7.2.403 b/7.2.403 new file mode 100644 index 0000000..d2949db --- /dev/null +++ b/7.2.403 @@ -0,0 +1,53 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.403 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.403 (after 7.2.400) +Problem: Compiler warning for pointer type. (Tony Mechelynck) +Solution: Move type cast to the right place. +Files: src/if_ruby.c + + +*** ../vim-7.2.402/src/if_ruby.c 2010-03-17 18:15:17.000000000 +0100 +--- src/if_ruby.c 2010-03-19 23:08:06.000000000 +0100 +*************** +*** 722,729 **** + + if (tv->v_type == VAR_STRING) + { +! result = rb_str_new2((char *)(tv->vval.v_string == NULL +! ? "" : tv->vval.v_string)); + } + else if (tv->v_type == VAR_NUMBER) + { +--- 722,729 ---- + + if (tv->v_type == VAR_STRING) + { +! result = rb_str_new2(tv->vval.v_string == NULL +! ? "" : (char *)(tv->vval.v_string)); + } + else if (tv->v_type == VAR_NUMBER) + { +*** ../vim-7.2.402/src/version.c 2010-03-17 19:53:44.000000000 +0100 +--- src/version.c 2010-03-19 23:07:13.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 403, + /**/ + +-- +If "R" is Reverse, how come "D" is FORWARD? + + /// 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 1b2ab9b..88c26ec 100644 --- a/README.patches +++ b/README.patches @@ -434,3 +434,4 @@ Individual patches for Vim 7.2: 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 diff --git a/vim.spec b/vim.spec index 522dd66..7ffd5e6 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 402 +%define patchlevel 403 Summary: The VIM editor URL: http://www.vim.org/ @@ -468,6 +468,7 @@ 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 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -1008,6 +1009,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch400 -p0 %patch401 -p0 %patch402 -p0 +%patch403 -p0 # install spell files @@ -1472,6 +1474,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Sat Mar 20 2010 Karsten Hopp 7.2.403-1 +- patchlevel 403 + * Thu Mar 18 2010 Karsten Hopp 7.2.402-1 - patchlevel 402