SOURCES: 7.2.088 (NEW), 7.2.089 (NEW) - new
adamg
adamg at pld-linux.org
Fri Feb 6 17:47:14 CET 2009
Author: adamg Date: Fri Feb 6 16:47:14 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new
---- Files affected:
SOURCES:
7.2.088 (NONE -> 1.1) (NEW)
SOURCES:
7.2.089 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/7.2.088
diff -u /dev/null SOURCES/7.2.088:1.1
--- /dev/null Fri Feb 6 17:47:15 2009
+++ SOURCES/7.2.088 Fri Feb 6 17:47:08 2009
@@ -0,0 +1,99 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.088 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+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 at 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 ///
================================================================
Index: SOURCES/7.2.089
diff -u /dev/null SOURCES/7.2.089:1.1
--- /dev/null Fri Feb 6 17:47:15 2009
+++ SOURCES/7.2.089 Fri Feb 6 17:47:12 2009
@@ -0,0 +1,91 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.089 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.089 (extra)
+Problem: Win32: crash when using Ultramon buttons.
+Solution: Don't use a WM_OLE message of zero size. (Ray Megal)
+Files: src/if_ole.cpp, src/gui_w48.c
+
+
+*** ../vim-7.2.088/src/if_ole.cpp Sun Mar 16 14:53:11 2008
+--- src/if_ole.cpp Mon Jan 19 21:16:33 2009
+***************
+*** 353,361 ****
+ }
+
+ /* Pass the string to the main input loop. The memory will be freed when
+! * the message is processed.
+ */
+! PostMessage(NULL, WM_OLE, 0, (LPARAM)str);
+
+ return S_OK;
+ }
+--- 353,365 ----
+ }
+
+ /* Pass the string to the main input loop. The memory will be freed when
+! * the message is processed. Except for an empty message, we don't need
+! * to post it then.
+ */
+! if (*str == NUL)
+! vim_free(str);
+! else
+! PostMessage(NULL, WM_OLE, 0, (LPARAM)str);
+
+ return S_OK;
+ }
+*** ../vim-7.2.088/src/gui_w48.c Wed Dec 24 12:20:10 2008
+--- src/gui_w48.c Mon Jan 19 21:19:30 2009
+***************
+*** 1663,1670 ****
+ if (msg.message == WM_OLE)
+ {
+ char_u *str = (char_u *)msg.lParam;
+! add_to_input_buf(str, (int)STRLEN(str));
+! vim_free(str);
+ return;
+ }
+ #endif
+--- 1663,1679 ----
+ if (msg.message == WM_OLE)
+ {
+ char_u *str = (char_u *)msg.lParam;
+! if (str == NULL || *str == NUL)
+! {
+! /* Message can't be ours, forward it. Fixes problem with Ultramon
+! * 3.0.4 */
+! DispatchMessage(&msg);
+! }
+! else
+! {
+! add_to_input_buf(str, (int)STRLEN(str));
+! vim_free(str); /* was allocated in CVim::SendKeys() */
+! }
+ return;
+ }
+ #endif
+*** ../vim-7.2.088/src/version.c Thu Jan 22 21:49:21 2009
+--- src/version.c Wed Jan 28 14:16:01 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+ { /* Add new patch number below this line */
++ /**/
++ 89,
+ /**/
+
+
+--
+How To Keep A Healthy Level Of Insanity:
+16. Have your coworkers address you by your wrestling name, Rock Hard Kim.
+
+ /// Bram Moolenaar -- Bram at 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 ///
================================================================
More information about the pld-cvs-commit
mailing list