Mercurial > vim
annotate src/Make_cyg.mak @ 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 | b0e19f135e50 |
children |
rev | line source |
---|---|
7 | 1 # |
6326 | 2 # Makefile for VIM on Win32, using MinGW cross compiler on Cygwin |
146 | 3 # |
4 # Also read INSTALLpc.txt! | |
7 | 5 # |
6 # This compiles Vim as a Windows application. If you want Vim to run as a | |
7 # Cygwin application use the Makefile (just like on Unix). | |
8 # | |
6326 | 9 # The old Make_cyg.mak (maintained by Dan Sharp et al.) was merged into |
10 # Make_cyg_ming.mak. Note: USEDLL option was removed. | |
11 # This file contains Cygwin specific settings. Common settings are contained | |
12 # in Make_cyg_ming.mak. | |
13 # | |
14 # Last updated by Ken Takata. | |
15 # Last Change: 2014 Oct 21 | |
7 | 16 |
4137 | 17 |
6326 | 18 # uncomment 'PERL' if you want a perl-enabled version |
19 #PERL=/cygdrive/c/perl | |
7 | 20 |
6326 | 21 # uncomment 'LUA' if you want a Lua-enabled version |
22 #LUA=/cygdrive/c/lua | |
7 | 23 |
6326 | 24 # uncomment 'MZSCHEME' if you want a MzScheme-enabled version |
25 #MZSCHEME=/cygdrive/d/plt | |
3959 | 26 |
6326 | 27 # uncomment 'PYTHON' if you want a python-enabled version |
28 #PYTHON=/cygdrive/c/python20 | |
7 | 29 |
6326 | 30 # uncomment 'PYTHON3' if you want a python3-enabled version |
31 #PYTHON3=/cygdrive/c/python31 | |
2320
966a5609669e
Added Lua interfae. (Luis Carvalho)
Bram Moolenaar <bram@vim.org>
parents:
2309
diff
changeset
|
32 |
6326 | 33 # uncomment 'TCL' if you want a Tcl-enabled version |
34 #TCL=/cygdrive/c/tcl | |
7 | 35 |
6326 | 36 # uncomment 'RUBY' if you want a Ruby-enabled version |
37 #RUBY=/cygdribe/c/ruby | |
6110 | 38 |
7 | 39 |
16198
b0e19f135e50
patch 8.1.1104: MS-Windows: not all environment variables can be used
Bram Moolenaar <Bram@vim.org>
parents:
12525
diff
changeset
|
40 # Use MinGW-w64 cross compiler. |
b0e19f135e50
patch 8.1.1104: MS-Windows: not all environment variables can be used
Bram Moolenaar <Bram@vim.org>
parents:
12525
diff
changeset
|
41 # There are two MinGW-w64 packages in Cygwin: |
b0e19f135e50
patch 8.1.1104: MS-Windows: not all environment variables can be used
Bram Moolenaar <Bram@vim.org>
parents:
12525
diff
changeset
|
42 # 32-bit: mingw64-i686-gcc-g++ |
6326 | 43 # 64-bit: mingw64-x86_64-gcc-g++ |
44 # You may also need to set 'ARCH' in Make_cyg_ming.mak. | |
16198
b0e19f135e50
patch 8.1.1104: MS-Windows: not all environment variables can be used
Bram Moolenaar <Bram@vim.org>
parents:
12525
diff
changeset
|
45 CROSS_COMPILE = i686-w64-mingw32- |
6326 | 46 #CROSS_COMPILE = x86_64-w64-mingw32- |
7 | 47 |
48 | |
6326 | 49 # Do not change this. |
50 UNDER_CYGWIN = yes | |
51 include Make_cyg_ming.mak | |
12525
626fb8e8bb8a
patch 8.0.1141: MS-Windows build dependencies are incomplete
Christian Brabandt <cb@256bit.org>
parents:
6326
diff
changeset
|
52 |
626fb8e8bb8a
patch 8.0.1141: MS-Windows build dependencies are incomplete
Christian Brabandt <cb@256bit.org>
parents:
6326
diff
changeset
|
53 # vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0: |