• R/O
  • SSH

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoapythonrubywindowsphpgameguibathyscaphec翻訳omegatframework計画中(planning stage)twitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

K.Takata's patch queue for Vim


Commit MetaInfo

Revision2e7483d1e6e19d27597a36e07e2e16c40e758215 (tree)
Zeit2022-01-21 20:19:22
AutorK.Takata <kentkt@csc....>
CommiterK.Takata

Log Message

Update for 8.2.4169

Delete merged patches.

Ändern Zusammenfassung

  • modified: series (diff)
  • 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 @@
2828 add-msvc-latest-bat.patch
2929 add-testing-option-7970.patch
3030 wip-win32-vimdir-encoding.patch #+wip
31-win32-fix-font.patch
32-win32-remove-casts.patch
3331 win32-use-unicode-message-api.patch
3432 win32-directwrite-ambiwidth-auto.patch
3533 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 @@
1-# HG changeset patch
2-# Parent b622b213936cd8ad15ea731fbc6d78f66b50c418
3-
4-diff --git a/src/gui_w32.c b/src/gui_w32.c
5---- a/src/gui_w32.c
6-+++ b/src/gui_w32.c
7-@@ -3398,7 +3398,7 @@ gui_mch_init_font(char_u *font_name, int
8- return FAIL;
9-
10- if (font_name == NULL)
11-- font_name = (char_u *)lf.lfFaceName;
12-+ font_name = (char_u *)"";
13- #ifdef FEAT_MBYTE_IME
14- norm_logfont = lf;
15- 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 @@
1-# HG changeset patch
2-# Parent e2f32e0d3c77b1a0865855777789dd1317c42821
3-
4-diff --git a/src/gui_w32.c b/src/gui_w32.c
5---- a/src/gui_w32.c
6-+++ b/src/gui_w32.c
7-@@ -2754,7 +2754,7 @@ gui_mch_find_dialog(exarg_T *eap)
8- if (!IsWindow(s_findrep_hwnd))
9- {
10- initialise_findrep(eap->arg);
11-- s_findrep_hwnd = FindTextW((LPFINDREPLACEW) &s_findrep_struct);
12-+ s_findrep_hwnd = FindTextW(&s_findrep_struct);
13- }
14-
15- set_window_title(s_findrep_hwnd, _("Find string"));
16-@@ -2778,7 +2778,7 @@ gui_mch_replace_dialog(exarg_T *eap)
17- if (!IsWindow(s_findrep_hwnd))
18- {
19- initialise_findrep(eap->arg);
20-- s_findrep_hwnd = ReplaceTextW((LPFINDREPLACEW) &s_findrep_struct);
21-+ s_findrep_hwnd = ReplaceTextW(&s_findrep_struct);
22- }
23-
24- set_window_title(s_findrep_hwnd, _("Find & Replace"));
25-@@ -2952,7 +2952,7 @@ gui_mch_getmouse(int *x, int *y)
26- POINT mp;
27-
28- (void)GetWindowRect(s_textArea, &rct);
29-- (void)GetCursorPos((LPPOINT)&mp);
30-+ (void)GetCursorPos(&mp);
31- *x = (int)(mp.x - rct.left);
32- *y = (int)(mp.y - rct.top);
33- }
34-@@ -3529,7 +3529,7 @@ mch_set_mouse_shape(int shape)
35- POINT mp;
36-
37- // Set the position to make it redrawn with the new shape.
38-- (void)GetCursorPos((LPPOINT)&mp);
39-+ (void)GetCursorPos(&mp);
40- (void)SetCursorPos(mp.x, mp.y);
41- ShowCursor(TRUE);
42- }
43-@@ -6590,7 +6590,7 @@ gui_mch_show_popupmenu(vimmenu_T *menu)
44- {
45- POINT mp;
46-
47-- (void)GetCursorPos((LPPOINT)&mp);
48-+ (void)GetCursorPos(&mp);
49- gui_mch_show_popupmenu_at(menu, (int)mp.x, (int)mp.y);
50- }
51-
52-@@ -7743,7 +7743,7 @@ gui_mch_tearoff(
53- if (IsWindow(menu->tearoff_handle))
54- {
55- POINT mp;
56-- if (GetCursorPos((LPPOINT)&mp))
57-+ if (GetCursorPos(&mp))
58- {
59- SetWindowPos(menu->tearoff_handle, NULL, mp.x, mp.y, 0, 0,
60- SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER);