Mercurial > vim
view src/os_w32exe.c @ 34680:2fd4ce2a5058 v9.1.0221
patch 9.1.0221: lines following virt text (that fills the window) might be truncated
Commit: https://github.com/vim/vim/commit/b6fac4db3647179671d3267a4bcd418e92cd4572
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 11:40:41 2024 +0100
patch 9.1.0221: lines following virt text (that fills the window) might be truncated
Problem: The if branch to set `text_prop_follows` was both checking if
it was at the end of the buffer text line or if it was at the
end of the screen line, but the former being true skipped
a guard condition in the latter to only consider 'below'
virtual text to follow. `text_prop_follows` being improperly
set caused it to skip a conditional block to break at the end
as well as one to move `ptr` to the end of the text line,
while repeated for each following line of the window.
Solution: Move the check for whether 'below' virtual text should follow
so it is also used when at the end of the buffer text line.
(Dylan Thacker-Smith)
fixes: #12213
related: #14307
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:00:03 +0100 |
parents | 7e733046db1d |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * GUI support by Robert Webb * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. * See README.txt for an overview of the Vim source code. */ /* * Windows GUI: main program (EXE) entry point: * * Ron Aaron <ronaharon@yahoo.com> wrote this and the (now deleted) DLL support * code. */ #include "vim.h" // cproto doesn't create a prototype for VimMain() #ifdef VIMDLL __declspec(dllimport) #endif int VimMain(int argc, char **argv); #ifndef VIMDLL void SaveInst(HINSTANCE hInst); #endif #ifndef PROTO # ifdef FEAT_GUI int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInst UNUSED, LPWSTR lpszCmdLine UNUSED, int nCmdShow UNUSED) # else int wmain(int argc UNUSED, wchar_t **argv UNUSED) # endif { # ifndef VIMDLL # ifdef FEAT_GUI SaveInst(hInstance); # else SaveInst(GetModuleHandleW(NULL)); # endif # endif VimMain(0, NULL); return 0; } #endif