annotate src/vim.rc @ 34686:83875247fbc0 v9.1.0224

patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15 Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com> Date: Thu Mar 28 12:01:14 2024 +0100 patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text Problem: If a line has "right" & "below" virtual text properties, where the "below" property may be stored first due to lack of ordering between them, then the line height is calculated to be 1 more and causes the cursor to far over the line. Solution: Remove some unnecessary setting of a `next_right_goes_below = TRUE` flag for "below" and "above" text properties. (Dylan Thacker-Smith) I modified a regression test I recently added to cover this case, leveraging the fact that "after", "right" & "below" text properties are being stored in the reverse of the order they are added in. The previous version of this regression test was crafted to workaround this issue so it can be addressed by this separate patch. closes: #14317 Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Thu, 28 Mar 2024 12:15:03 +0100
parents 2e6cc2bf37d8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10042
4aead6a9b7a9 commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents: 5153
diff changeset
1 // vi:set ts=8 sts=4 sw=4 noet:
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 // VIM - Vi IMproved by Bram Moolenaar
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 // Do ":help uganda" in Vim to read copying and usage conditions.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 // Do ":help credits" in Vim to see a list of people who contributed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 // vim.rc
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 // Icon and version information for the Win32 version of Vim
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 // Must be in DOS format <CR><NL>!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11
39
410fa1a31baf updated for version 7.0023
vimboss
parents: 7
diff changeset
12 #include <winver.h>
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 #include "version.h"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 #include "gui_w32_rc.h"
16606
7e733046db1d patch 8.1.1306: Borland support is outdated and doesn't work
Bram Moolenaar <Bram@vim.org>
parents: 16451
diff changeset
15 #include <winresrc.h>
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16
18855
02e2707808b2 patch 8.1.2414: MS-Windows: properties dialog box shows wrong character
Bram Moolenaar <Bram@vim.org>
parents: 18287
diff changeset
17 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
02e2707808b2 patch 8.1.2414: MS-Windows: properties dialog box shows wrong character
Bram Moolenaar <Bram@vim.org>
parents: 18287
diff changeset
18 #pragma code_page(1252)
02e2707808b2 patch 8.1.2414: MS-Windows: properties dialog box shows wrong character
Bram Moolenaar <Bram@vim.org>
parents: 18287
diff changeset
19
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21 // Icons
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23 IDR_VIM ICON "vim.ico"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
24
16451
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
25 #if (defined(FEAT_GUI_MSWIN) && !defined(VIMDLL)) || defined(RCDLL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 IDR_VIM_ERROR ICON "vim_error.ico"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 IDR_VIM_ALERT ICON "vim_alert.ico"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 IDR_VIM_INFO ICON "vim_info.ico"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29 IDR_VIM_QUESTION ICON "vim_quest.ico"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32 // Bitmaps
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
33 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34 IDB_TEAROFF BITMAP DISCARDABLE "tearoff.bmp"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 IDR_TOOLBAR1 BITMAP DISCARDABLE "tools.bmp"
16451
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
36 #endif // FEAT_GUI_MSWIN
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37
16451
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
38 #ifndef RCDLL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
39 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
40 // WinXP theme support
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
41 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42 #ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 # define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45 #ifndef RT_MANIFEST
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
46 # define RT_MANIFEST 24
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
47 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48
24689
2e6cc2bf37d8 patch 8.2.2883: MS-Windows manifest file name is misleading
Bram Moolenaar <Bram@vim.org>
parents: 18874
diff changeset
49 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "vim.manifest"
16451
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
50 #endif // RCDLL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
51
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
52 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
53 // Type Library
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
54 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
55 #ifdef FEAT_OLE
1622
149d8b46404c updated for version 7.2a
vimboss
parents: 714
diff changeset
56 1 TYPELIB "vim.tlb"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
57 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
58
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
59 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
60 // Version
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
61 //
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
62
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
63 VS_VERSION_INFO VERSIONINFO
18287
50a16f2a54a8 patch 8.1.2138: including the build number in the Win32 binary is confusing
Bram Moolenaar <Bram@vim.org>
parents: 16606
diff changeset
64 FILEVERSION VIM_VERSION_MAJOR,VIM_VERSION_MINOR,VIM_VERSION_PATCHLEVEL
50a16f2a54a8 patch 8.1.2138: including the build number in the Win32 binary is confusing
Bram Moolenaar <Bram@vim.org>
parents: 16606
diff changeset
65 PRODUCTVERSION VIM_VERSION_MAJOR,VIM_VERSION_MINOR,VIM_VERSION_PATCHLEVEL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
66 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
67
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
68 #if VIM_VERSION_PATCHLEVEL > 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
69 #ifdef _DEBUG
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
70 FILEFLAGS VS_FF_PRERELEASE | VS_FF_DEBUG | VS_FF_PATCHED
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
71 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
72 FILEFLAGS VS_FF_PRERELEASE | VS_FF_PATCHED
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
73 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
74 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
75 #ifdef _DEBUG
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
76 FILEFLAGS VS_FF_PRERELEASE | VS_FF_DEBUG
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
77 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
78 FILEFLAGS VS_FF_PRERELEASE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
79 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
80 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
81
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
82 FILEOS VOS__WINDOWS32
16451
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
83 #ifdef RCDLL
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
84 FILETYPE VFT_DLL
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
85 #else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
86 FILETYPE VFT_APP
16451
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
87 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
88 FILESUBTYPE 0x0L
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
89 BEGIN
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
90 BLOCK "StringFileInfo"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
91 BEGIN
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
92 // 0x0409 == U.S. English; 0x04E4 => Windows Multilingual
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
93 BLOCK "040904E4"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
94 BEGIN
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
95 VALUE "CompanyName", "Vim Developers\0"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
96 VALUE "FileDescription", "Vi Improved - A Text Editor\0"
18874
ff39fc87f6b3 patch 8.1.2423: MS-Windows properties shows version as "8, 1, 0"
Bram Moolenaar <Bram@vim.org>
parents: 18855
diff changeset
97 VALUE "FileVersion", VIM_VERSION_MAJOR_STR "." VIM_VERSION_MINOR_STR "." VIM_VERSION_PATCHLEVEL_STR "\0"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
98 VALUE "InternalName", "VIM\0"
5153
b5abda4e7c4b updated for version 7.4a.003
Bram Moolenaar <bram@vim.org>
parents: 4932
diff changeset
99 VALUE "LegalCopyright", "Copyright \251 1996\0"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
100 VALUE "LegalTrademarks", "Vim\0"
16451
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
101 #ifdef VIMDLLBASE
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
102 VALUE "OriginalFilename", VIMDLLBASE ".dll\0"
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
103 #elif defined(FEAT_GUI_MSWIN)
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
104 VALUE "OriginalFilename", "gvim.exe\0"
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
105 #else
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
106 VALUE "OriginalFilename", "vim.exe\0"
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
107 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
108 VALUE "ProductName", "Vim\0"
18874
ff39fc87f6b3 patch 8.1.2423: MS-Windows properties shows version as "8, 1, 0"
Bram Moolenaar <Bram@vim.org>
parents: 18855
diff changeset
109 VALUE "ProductVersion", VIM_VERSION_MAJOR_STR "." VIM_VERSION_MINOR_STR "." VIM_VERSION_PATCHLEVEL_STR "\0"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
110 END
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
111 END
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
112 BLOCK "VarFileInfo"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
113 BEGIN
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
114 VALUE "Translation", 0x409, 0x4E4
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
115 END
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
116 END
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
117
16451
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
118 #if !defined(VIMDLL) || defined(RCDLL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
119 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
120 * Printing Status Dialog (should only be used when FEAT_PRINTER is defined)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
121 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
122 #define IDC_BOX1 400
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
123 #define IDC_PRINTTEXT1 401
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
124 #define IDC_PRINTTEXT2 402
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
125 #define IDC_PROGRESS 403
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
126 PRINTDLGBOX DIALOG 115, 63, 210, 80
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
127 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
128 FONT 8, "Helv"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
129 BEGIN
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
130 DEFPUSHBUTTON "Cancel", IDCANCEL, 85, 60, 40, 14
4932
1cf02fbe6281 updated for version 7.3.1211
Bram Moolenaar <bram@vim.org>
parents: 1622
diff changeset
131 CTEXT "Printing",IDC_PRINTTEXT1,23,15,157,9
1cf02fbe6281 updated for version 7.3.1211
Bram Moolenaar <bram@vim.org>
parents: 1622
diff changeset
132 CTEXT " ",IDC_PRINTTEXT2,23,25,157,9
1cf02fbe6281 updated for version 7.3.1211
Bram Moolenaar <bram@vim.org>
parents: 1622
diff changeset
133 CTEXT "Initializing...",IDC_PROGRESS,24,38,157,9
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
134 GROUPBOX "",IDC_BOX1,19,9,170,47
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
135 END
16451
7ae2396cef62 patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents: 15886
diff changeset
136 #endif