Commit: 2e7483d1e6e19d27597a36e07e2e16c40e758215 - vim-ktakata-mq (hg)

K.Takata's patch queue for Vim

Commit MetaInfo

• Revision: 2e7483d1e6e19d27597a36e07e2e16c40e758215 (tree)
• Zeit: 2022-01-21 20:19:22
• Autor: K.Takata <kentkt@csc....>
• Commiter: K.Takata

Log Message

Update for 8.2.4169

Delete merged patches.

Ändern Zusammenfassung

• modified: series
• delete: win32-fix-font.patch
• delete: win32-remove-casts.patch

Diff

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

diff -r ef90a5349fb7 -r 2e7483d1e6e1 win32-fix-font.patch
--- a/win32-fix-font.patch	Fri Jan 21 16:28:43 2022 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# HG changeset patch
-# Parent  b622b213936cd8ad15ea731fbc6d78f66b50c418
-
-diff --git a/src/gui_w32.c b/src/gui_w32.c
---- a/src/gui_w32.c
-+++ b/src/gui_w32.c
-@@ -3398,7 +3398,7 @@ gui_mch_init_font(char_u *font_name, int
- 	return FAIL;
- 
-     if (font_name == NULL)
--	font_name = (char_u *)lf.lfFaceName;
-+	font_name = (char_u *)"";
- #ifdef FEAT_MBYTE_IME
-     norm_logfont = lf;
-     sub_logfont = lf;

diff -r ef90a5349fb7 -r 2e7483d1e6e1 win32-remove-casts.patch
--- a/win32-remove-casts.patch	Fri Jan 21 16:28:43 2022 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-# HG changeset patch
-# Parent  e2f32e0d3c77b1a0865855777789dd1317c42821
-
-diff --git a/src/gui_w32.c b/src/gui_w32.c
---- a/src/gui_w32.c
-+++ b/src/gui_w32.c
-@@ -2754,7 +2754,7 @@ gui_mch_find_dialog(exarg_T *eap)
- 	if (!IsWindow(s_findrep_hwnd))
- 	{
- 	    initialise_findrep(eap->arg);
--	    s_findrep_hwnd = FindTextW((LPFINDREPLACEW) &s_findrep_struct);
-+	    s_findrep_hwnd = FindTextW(&s_findrep_struct);
- 	}
- 
- 	set_window_title(s_findrep_hwnd, _("Find string"));
-@@ -2778,7 +2778,7 @@ gui_mch_replace_dialog(exarg_T *eap)
- 	if (!IsWindow(s_findrep_hwnd))
- 	{
- 	    initialise_findrep(eap->arg);
--	    s_findrep_hwnd = ReplaceTextW((LPFINDREPLACEW) &s_findrep_struct);
-+	    s_findrep_hwnd = ReplaceTextW(&s_findrep_struct);
- 	}
- 
- 	set_window_title(s_findrep_hwnd, _("Find & Replace"));
-@@ -2952,7 +2952,7 @@ gui_mch_getmouse(int *x, int *y)
-     POINT mp;
- 
-     (void)GetWindowRect(s_textArea, &rct);
--    (void)GetCursorPos((LPPOINT)&mp);
-+    (void)GetCursorPos(&mp);
-     *x = (int)(mp.x - rct.left);
-     *y = (int)(mp.y - rct.top);
- }
-@@ -3529,7 +3529,7 @@ mch_set_mouse_shape(int shape)
- 	    POINT mp;
- 
- 	    // Set the position to make it redrawn with the new shape.
--	    (void)GetCursorPos((LPPOINT)&mp);
-+	    (void)GetCursorPos(&mp);
- 	    (void)SetCursorPos(mp.x, mp.y);
- 	    ShowCursor(TRUE);
- 	}
-@@ -6590,7 +6590,7 @@ gui_mch_show_popupmenu(vimmenu_T *menu)
- {
-     POINT mp;
- 
--    (void)GetCursorPos((LPPOINT)&mp);
-+    (void)GetCursorPos(&mp);
-     gui_mch_show_popupmenu_at(menu, (int)mp.x, (int)mp.y);
- }
- 
-@@ -7743,7 +7743,7 @@ gui_mch_tearoff(
-     if (IsWindow(menu->tearoff_handle))
-     {
- 	POINT mp;
--	if (GetCursorPos((LPPOINT)&mp))
-+	if (GetCursorPos(&mp))
- 	{
- 	    SetWindowPos(menu->tearoff_handle, NULL, mp.x, mp.y, 0, 0,
- 		    SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER);