Commit: 1093a6380f17f31fa88169068757c497738d04f5 - vim-ktakata-mq (hg)

K.Takata's patch queue for Vim

Commit MetaInfo

• Revision: 1093a6380f17f31fa88169068757c497738d04f5 (tree)
• Zeit: 2022-01-21 20:48:53
• Autor: K.Takata <kentkt@csc....>
• Commiter: K.Takata

Log Message

Update for 8.2.4170

Delete a merged patch.

Ändern Zusammenfassung

• modified: series
• delete: win32-use-unicode-message-api.patch

Diff

diff -r 2e7483d1e6e1 -r 1093a6380f17 series
--- a/series	Fri Jan 21 20:19:22 2022 +0900
+++ b/series	Fri Jan 21 20:48:53 2022 +0900
@@ -28,6 +28,5 @@
 add-msvc-latest-bat.patch
 add-testing-option-7970.patch
 wip-win32-vimdir-encoding.patch #+wip
-win32-use-unicode-message-api.patch
 win32-directwrite-ambiwidth-auto.patch
 fix-config_cache-removal.patch #+rejected

diff -r 2e7483d1e6e1 -r 1093a6380f17 win32-use-unicode-message-api.patch
--- a/win32-use-unicode-message-api.patch	Fri Jan 21 20:19:22 2022 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-# HG changeset patch
-# Parent  9c4365bc58314e899f3feee2f039635a77d70093
-
-diff --git a/src/gui_w32.c b/src/gui_w32.c
---- a/src/gui_w32.c
-+++ b/src/gui_w32.c
-@@ -636,7 +636,7 @@ gui_mch_set_blinking(long wait, long on,
-     KillTimer(NULL, idEvent);
- 
-     // Eat spurious WM_TIMER messages
--    while (pPeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
-+    while (PeekMessageW(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
- 	;
- 
-     if (blink_state == BLINK_ON)
-@@ -665,7 +665,7 @@ gui_mswin_rm_blink_timer(void)
-     {
- 	KillTimer(NULL, blink_timer);
- 	// Eat spurious WM_TIMER messages
--	while (pPeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
-+	while (PeekMessageW(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
- 	    ;
- 	blink_timer = 0;
-     }
-@@ -726,7 +726,7 @@ gui_mch_start_blink(void)
-     s_timed_out = TRUE;
- 
-     // Eat spurious WM_TIMER messages
--    while (pPeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
-+    while (PeekMessageW(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
- 	;
-     if (idEvent == s_wait_timer)
- 	s_wait_timer = 0;
-@@ -1844,7 +1844,7 @@ process_message(void)
-     static char_u k10[] = {K_SPECIAL, 'k', ';', 0};
- #endif
- 
--    pGetMessage(&msg, NULL, 0, 0);
-+    GetMessageW(&msg, NULL, 0, 0);
- 
- #ifdef FEAT_OLE
-     // Look after OLE Automation commands
-@@ -1855,7 +1855,7 @@ process_message(void)
- 	{
- 	    // Message can't be ours, forward it.  Fixes problem with Ultramon
- 	    // 3.0.4
--	    pDispatchMessage(&msg);
-+	    DispatchMessageW(&msg);
- 	}
- 	else
- 	{
-@@ -1868,7 +1868,7 @@ process_message(void)
- 
- #ifdef MSWIN_FIND_REPLACE
-     // Don't process messages used by the dialog
--    if (s_findrep_hwnd != NULL && pIsDialogMessage(s_findrep_hwnd, &msg))
-+    if (s_findrep_hwnd != NULL && IsDialogMessageW(s_findrep_hwnd, &msg))
-     {
- 	HandleMouseHide(msg.message, msg.lParam);
- 	return;
-@@ -2065,7 +2065,7 @@ process_message(void)
-     if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE,
- 							  NULL, NULL) == NULL)
- #endif
--	pDispatchMessage(&msg);
-+	DispatchMessageW(&msg);
- }
- 
- /*
-@@ -2080,7 +2080,7 @@ gui_mch_update(void)
-     MSG	    msg;
- 
-     if (!s_busy_processing)
--	while (pPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)
-+	while (PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE)
- 						  && !vim_is_input_buf_full())
- 	    process_message();
- }
-@@ -2095,7 +2095,7 @@ remove_any_timer(void)
- 	KillTimer(NULL, s_wait_timer);
- 
- 	// Eat spurious WM_TIMER messages
--	while (pPeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
-+	while (PeekMessageW(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
- 	    ;
- 	s_wait_timer = 0;
-     }
-@@ -2163,7 +2163,7 @@ gui_mch_wait_for_chars(int wtime)
- 	    if (did_add_timer)
- 		break;
- # endif
--	    if (pPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE))
-+	    if (PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE))
- 	    {
- 		process_message();
- 		break;
-diff --git a/src/os_mswin.c b/src/os_mswin.c
---- a/src/os_mswin.c
-+++ b/src/os_mswin.c
-@@ -1126,12 +1126,12 @@ AbortProc(HDC hdcPrn UNUSED, int iCode U
- {
-     MSG msg;
- 
--    while (!*bUserAbort && pPeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-+    while (!*bUserAbort && PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
-     {
--	if (!hDlgPrint || !pIsDialogMessage(hDlgPrint, &msg))
-+	if (!hDlgPrint || !IsDialogMessageW(hDlgPrint, &msg))
- 	{
- 	    TranslateMessage(&msg);
--	    pDispatchMessage(&msg);
-+	    DispatchMessageW(&msg);
- 	}
-     }
-     return !*bUserAbort;
-@@ -2579,10 +2579,10 @@ serverProcessPendingMessages(void)
- {
-     MSG msg;
- 
--    while (pPeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-+    while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
-     {
- 	TranslateMessage(&msg);
--	pDispatchMessage(&msg);
-+	DispatchMessageW(&msg);
-     }
- }
- 
-diff --git a/src/os_win32.c b/src/os_win32.c
---- a/src/os_win32.c
-+++ b/src/os_win32.c
-@@ -4124,10 +4124,10 @@ mch_system_classic(char *cmd, int option
- 	{
- 	    MSG	msg;
- 
--	    if (pPeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
-+	    if (PeekMessageW(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
- 	    {
- 		TranslateMessage(&msg);
--		pDispatchMessage(&msg);
-+		DispatchMessageW(&msg);
- 		delay = 1;
- 		continue;
- 	    }
-@@ -4446,10 +4446,10 @@ mch_system_piped(char *cmd, int options)
-     {
- 	MSG	msg;
- 
--	if (pPeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
-+	if (PeekMessageW(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
- 	{
- 	    TranslateMessage(&msg);
--	    pDispatchMessage(&msg);
-+	    DispatchMessageW(&msg);
- 	}
- 
- 	// write pipe information in the window
-diff --git a/src/os_win32.h b/src/os_win32.h
---- a/src/os_win32.h
-+++ b/src/os_win32.h
-@@ -202,9 +202,3 @@ Trace(char *pszFormat, ...);
- #endif
- #define mch_getenv(x) (char_u *)getenv((char *)(x))
- #define vim_mkdir(x, y) mch_mkdir(x)
--
--// Enable common dialogs input unicode from IME if possible.
--#define pDispatchMessage DispatchMessageW
--#define pGetMessage GetMessageW
--#define pIsDialogMessage IsDialogMessageW
--#define pPeekMessage PeekMessageW