diff --git a/7.1.291 b/7.1.291 new file mode 100644 index 0000000..d7b72a0 --- /dev/null +++ b/7.1.291 @@ -0,0 +1,70 @@ +To: vim-dev@vim.org +Subject: Patch 7.1.291 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.1.291 (after 7.1.288) +Problem: Compiler warning. +Solution: Change 50 to 50L. +Files: src/if_cscope.c + + +*** ../vim-7.1.290/src/if_cscope.c Tue Apr 1 14:30:18 2008 +--- src/if_cscope.c Tue Apr 1 20:56:02 2008 +*************** +*** 2163,2169 **** + waitpid_errno = errno; + if (pid != 0) + break; /* break unless the process is still running */ +! mch_delay(50, FALSE); /* sleep 50 ms */ + } + # endif + /* +--- 2163,2169 ---- + waitpid_errno = errno; + if (pid != 0) + break; /* break unless the process is still running */ +! mch_delay(50L, FALSE); /* sleep 50 ms */ + } + # endif + /* +*************** +*** 2198,2204 **** + alive = FALSE; /* cscope process no longer exists */ + break; + } +! mch_delay(50, FALSE); /* sleep 50ms */ + } + } + if (alive) +--- 2198,2204 ---- + alive = FALSE; /* cscope process no longer exists */ + break; + } +! mch_delay(50L, FALSE); /* sleep 50ms */ + } + } + if (alive) +*** ../vim-7.1.290/src/version.c Tue Apr 1 17:13:54 2008 +--- src/version.c Tue Apr 1 20:58:11 2008 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 291, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +210. When you get a divorce, you don't care about who gets the children, + but discuss endlessly who can use the email address. + + /// 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 8d26375..5ffd87a 100644 --- a/README.patches +++ b/README.patches @@ -315,3 +315,11 @@ Individual patches for Vim 7.1: 2094 7.1.281 (after 7.1.279) Vim hangs when cscope doesn't exit 16302 7.1.282 (extra) Win64: Installing context menu, compiler warnings 7633 7.1.283 non-extra part of 7.1.282 + 2258 7.1.284 compiler warnings for functions without prototype + 5787 7.1.285 (extra) Mac: dialog hotkeys don't work + 2045 7.1.286 (after 7.1.103) "w" at end of buffer moves cursor too far + 1859 7.1.287 crash when reversing a list after using it + 3182 7.1.288 (after 7.1.281) cscope leaves behind temp files with gvim + 1979 7.1.289 when EXITFREE is defined and 'acd' is set freed memory is used + 2146 7.1.290 reading unwritten bytes when spell checking with large indent + 1940 7.1.291 compiler warning for int-long conversion diff --git a/vim.spec b/vim.spec index 016f6b2..a0bc45b 100644 --- a/vim.spec +++ b/vim.spec @@ -18,13 +18,13 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim71%{?beta} -%define patchlevel 283 +%define patchlevel 291 Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{beta}%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2 @@ -338,6 +338,14 @@ Patch280: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.280 Patch281: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.281 Patch282: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.282 Patch283: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.283 +Patch284: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.284 +Patch285: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.285 +Patch286: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.286 +Patch287: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.287 +Patch288: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.288 +Patch289: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.289 +Patch290: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.290 +Patch291: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.291 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -760,6 +768,14 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch281 -p0 %patch282 -p0 %patch283 -p0 +%patch284 -p0 +%patch285 -p0 +%patch286 -p0 +%patch287 -p0 +%patch288 -p0 +%patch289 -p0 +%patch290 -p0 +%patch291 -p0 # install spell files @@ -1164,6 +1180,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Apr 02 2008 Karsten Hopp 7.1.291-1 +- patchlevel 291, more fixes for leftover /tmp/cscope* files + * Tue Mar 18 2008 Tom "spot" Callaway 7.1.283-2 - add Requires for versioned perl (libperl.so)