diff --git a/7.2.088 b/7.2.088 new file mode 100644 index 0000000..1cb9851 --- /dev/null +++ b/7.2.088 @@ -0,0 +1,99 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.088 (extra) +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.088 (extra) +Problem: OpenClipboard() may fail when another application is using the + clipboard. +Solution: Retry OpenClipboard() a few times. (Jianrong Yu) +Files: src/os_mswin.c + + +*** ../vim-7.2.087/src/os_mswin.c Thu Nov 20 17:09:09 2008 +--- src/os_mswin.c Thu Jan 22 18:38:12 2009 +*************** +*** 1224,1229 **** +--- 1224,1248 ---- + #endif /* FEAT_MBYTE */ + + /* ++ * Wait for another process to Close the Clipboard. ++ * Returns TRUE for success. ++ */ ++ int ++ vim_open_clipboard() ++ { ++ int delay = 10; ++ ++ while (!OpenClipboard(NULL)) ++ { ++ if (delay > 500) ++ return FALSE; /* waited too long, give up */ ++ Sleep(delay); ++ delay *= 2; /* wait for 10, 20, 40, 80, etc. msec */ ++ } ++ return TRUE; ++ } ++ ++ /* + * Get the current selection and put it in the clipboard register. + * + * NOTE: Must use GlobalLock/Unlock here to ensure Win32s compatibility. +*************** +*** 1254,1260 **** + * Don't pass GetActiveWindow() as an argument to OpenClipboard() because + * then we can't paste back into the same window for some reason - webb. + */ +! if (!OpenClipboard(NULL)) + return; + + /* Check for vim's own clipboard format first. This only gets the type of +--- 1273,1279 ---- + * Don't pass GetActiveWindow() as an argument to OpenClipboard() because + * then we can't paste back into the same window for some reason - webb. + */ +! if (!vim_open_clipboard()) + return; + + /* Check for vim's own clipboard format first. This only gets the type of +*************** +*** 1562,1568 **** + * because then we can't paste back into the same window for some + * reason - webb. + */ +! if (OpenClipboard(NULL)) + { + if (EmptyClipboard()) + { +--- 1581,1587 ---- + * because then we can't paste back into the same window for some + * reason - webb. + */ +! if (vim_open_clipboard()) + { + if (EmptyClipboard()) + { +*** ../vim-7.2.087/src/version.c Thu Jan 22 21:31:24 2009 +--- src/version.c Thu Jan 22 21:47:52 2009 +*************** +*** 678,679 **** +--- 678,681 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 88, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +22. You've already visited all the links at Yahoo and you're halfway through + Lycos. + + /// 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 84ca99b..6664582 100644 --- a/README.patches +++ b/README.patches @@ -104,3 +104,12 @@ Individual patches for Vim 7.2: 4745 7.2.077 (after 7.2.076) rename() fails if names differ only in case 3298 7.2.078 problems with deleting folds 6947 7.2.079 "killed" netbeans events are not handled correctly + 9942 7.2.080 accessing wrong memory with completion and composing char + 1728 7.2.081 compiler warning for float overflow on VAX + 2134 7.2.082 if 'ff' is "mac" then "ga" on a ^J shows 0x0d instead of 0x0a + 1733 7.2.083 ":tag" doesn't return to the right tag entry in the tag stack + 4331 7.2.084 Python: vim.eval() is wrong for recursive structures + 1862 7.2.085 ":set =b" does not work when 'encoding' is utf-8 + 3045 7.2.086 using ":diffget 1" in buffer 1 corrupts the text + 1570 7.2.087 adding URL to 'path' doesn't work to edit a file + 2895 7.2.088 (extra) Win32: Using the clipboard sometimes fails diff --git a/vim.spec b/vim.spec index ae92a23..61cc400 100644 --- a/vim.spec +++ b/vim.spec @@ -18,13 +18,13 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 079 +%define patchlevel 088 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 @@ -145,6 +145,15 @@ Patch076: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.076 Patch077: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.077 Patch078: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.078 Patch079: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.079 +Patch080: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.080 +Patch081: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.081 +Patch082: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.082 +Patch083: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.083 +Patch084: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.084 +Patch085: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.085 +Patch086: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.086 +Patch087: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.087 +Patch088: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.088 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -357,7 +366,15 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch077 -p0 %patch078 -p0 %patch079 -p0 - +%patch080 -p0 +%patch081 -p0 +%patch082 -p0 +%patch083 -p0 +%patch084 -p0 +%patch085 -p0 +%patch086 -p0 +%patch087 -p0 +%patch088 -p0 # install spell files %if %{withvimspell} @@ -816,6 +833,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Jan 26 2009 Karsten Hopp 7.2.088-1 +- patchlevel 88 + * Thu Jan 08 2009 Karsten Hopp 7.2.079-2 - patchlevel 79