K.Takata's patch queue for Vim
リビジョン | 7e5359357ca5da999564ae8da6f6100f02c86949 (tree) |
---|---|
日時 | 2022-01-27 21:07:19 |
作者 | K.Takata <kentkt@csc....> |
コミッター | K.Takata |
Fix mistake
@@ -1,5 +1,5 @@ | ||
1 | 1 | # HG changeset patch |
2 | -# Parent fc10a8cb666b22b1f8febfefe0ac8fcc2f36b2a3 | |
2 | +# Parent 5c20d05d99169e742447cf8a681dfdf1afc471d7 | |
3 | 3 | |
4 | 4 | diff --git a/src/gui.c b/src/gui.c |
5 | 5 | --- a/src/gui.c |
@@ -40,17 +40,3 @@ | ||
40 | 40 | |
41 | 41 | /* |
42 | 42 | * Get the font for 'guifontwide'. |
43 | -diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp | |
44 | ---- a/src/gui_dwrite.cpp | |
45 | -+++ b/src/gui_dwrite.cpp | |
46 | -@@ -1176,8 +1176,8 @@ DWriteContext::GetCharWidth(int c) | |
47 | - } | |
48 | - else | |
49 | - { | |
50 | -- text[0] = ((c - 0x10000) >> 10) + 0xD800; | |
51 | -- text[1] = ((c - 0x10000) & 0x3ff) + 0xDC00; | |
52 | -+ text[0] = (WCHAR)(((c - 0x10000) >> 10) + 0xD800); | |
53 | -+ text[1] = (WCHAR)(((c - 0x10000) & 0x3ff) + 0xDC00); | |
54 | - len = 2; | |
55 | - } | |
56 | - text[len] = L'\0'; |
@@ -1,5 +1,5 @@ | ||
1 | 1 | # HG changeset patch |
2 | -# Parent d71a232aef1b6fcd8ef35f54a857e21f8147f0bf | |
2 | +# Parent 114cb64261269e48d5469e34e91c9df4074d801d | |
3 | 3 | |
4 | 4 | diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp |
5 | 5 | --- a/src/gui_dwrite.cpp |
@@ -47,8 +47,8 @@ | ||
47 | 47 | + } |
48 | 48 | + else |
49 | 49 | + { |
50 | -+ text[0] = ((c - 0x10000) >> 10) + 0xD800; | |
51 | -+ text[1] = ((c - 0x10000) & 0x3ff) + 0xDC00; | |
50 | ++ text[0] = (WCHAR)(((c - 0x10000) >> 10) + 0xD800); | |
51 | ++ text[1] = (WCHAR)(((c - 0x10000) & 0x3ff) + 0xDC00); | |
52 | 52 | + len = 2; |
53 | 53 | + } |
54 | 54 | + text[len] = L'\0'; |
@@ -116,7 +116,7 @@ | ||
116 | 116 | diff --git a/src/gui_w32.c b/src/gui_w32.c |
117 | 117 | --- a/src/gui_w32.c |
118 | 118 | +++ b/src/gui_w32.c |
119 | -@@ -5141,52 +5141,71 @@ error: | |
119 | +@@ -4913,52 +4913,71 @@ error: | |
120 | 120 | #endif |
121 | 121 | |
122 | 122 | #ifdef USE_AMBIWIDTH_AUTO |