diff options
author | zeertzjq <zeertzjq@outlook.com> | 2023-08-27 19:04:14 +0200 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2023-08-27 19:04:14 +0200 |
commit | 6a3897232aecd3e8b9e8b23955e55c1993e5baec (patch) | |
tree | 8a24311230d8c60a43290b5bcaed2080ba31af6a /src/testdir/dumps | |
parent | 9a6cf34a1ebdd258acbc6f186bffed42cec2c1a0 (diff) |
patch 9.0.1800: Cursor position still wrong with 'showbreak' and virtual textv9.0.1800
Problem: Cursor position still wrong with 'showbreak' and virtual text
after last character or 'listchars' "eol".
Solution: Remove unnecessary w_wcol adjustment in curs_columns(). Also
fix first char of virtual text not shown at the start of a screen
line.
closes: #12478
closes: #12532
closes: #12904
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
Diffstat (limited to 'src/testdir/dumps')
8 files changed, 33 insertions, 0 deletions
diff --git a/src/testdir/dumps/Test_cursor_position_with_showbreak_3.dump b/src/testdir/dumps/Test_cursor_position_with_showbreak_3.dump new file mode 100644 index 0000000000..4eca369413 --- /dev/null +++ b/src/testdir/dumps/Test_cursor_position_with_showbreak_3.dump @@ -0,0 +1,6 @@ +| +0#0000e05#a8a8a8255@1|x+0#0000000#ffffff0@71|X +| +0#0000e05#a8a8a8255@1|++0#4040ff13#ffffff0>$| +0#0000000&@70 +| +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|e|c|o|n|d| |l|i|n|e|$+0#4040ff13&| +0#0000000&@60 +|~+0#4040ff13&| @73 +|~| @73 +|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@44|1|,|7|4| @9|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_1.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_1.dump new file mode 100644 index 0000000000..11e61cc670 --- /dev/null +++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_1.dump @@ -0,0 +1,3 @@ +|a+0&#ffffff0@19>a@28|!+0#4040ff13& +|~| @48 +| +0#0000000&@31|1|,|2|1| @9|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_2.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_2.dump new file mode 100644 index 0000000000..14d5ec132c --- /dev/null +++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_2.dump @@ -0,0 +1,3 @@ +|a+0&#ffffff0@18>a@29|!+0#4040ff13& +|~| @48 +| +0#0000000&@31|1|,|2|1| @9|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_3.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_3.dump new file mode 100644 index 0000000000..7ff0949711 --- /dev/null +++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_3.dump @@ -0,0 +1,3 @@ +|a+0&#ffffff0@17>a@30|!+0#4040ff13& +|~| @48 +| +0#0000000&@31|1|,|2|1| @9|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_4.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_4.dump new file mode 100644 index 0000000000..1a70a750f2 --- /dev/null +++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_4.dump @@ -0,0 +1,3 @@ +|a+0&#ffffff0@16>a@30|b+0#e000e06&|!+0#4040ff13& +|~| @48 +| +0#0000000&@31|1|,|2|1| @9|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_5.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_5.dump new file mode 100644 index 0000000000..a6683d704e --- /dev/null +++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_5.dump @@ -0,0 +1,3 @@ +|a+0&#ffffff0@15>a@30|b+0#e000e06&@2 +|~+0#4040ff13&| @48 +| +0#0000000&@31|1|,|2|1| @9|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_showbreak_23.dump b/src/testdir/dumps/Test_prop_inserts_text_showbreak_23.dump new file mode 100644 index 0000000000..8577952af9 --- /dev/null +++ b/src/testdir/dumps/Test_prop_inserts_text_showbreak_23.dump @@ -0,0 +1,6 @@ +| +0&#ffffff0@1|1| |a@25 +| @5|++0#4040ff13&>1+0#e000e06&|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2 +| +0#0000000&@5|++0#4040ff13&|3+0#e000e06&|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1 +| +0#0000000&@5|++0#4040ff13&|2+0#e000e06&|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3 +|~+0#4040ff13&| @28 +|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@17 diff --git a/src/testdir/dumps/Test_prop_inserts_text_showbreak_24.dump b/src/testdir/dumps/Test_prop_inserts_text_showbreak_24.dump new file mode 100644 index 0000000000..d089cda963 --- /dev/null +++ b/src/testdir/dumps/Test_prop_inserts_text_showbreak_24.dump @@ -0,0 +1,6 @@ +| +0&#ffffff0@1|1| |a@25 +| @3|++0#4040ff13&>1+0#e000e06&|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1 +| +0#0000000&@3|++0#4040ff13&|2+0#e000e06&|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2 +| +0#0000000&@3|++0#4040ff13&|3+0#e000e06&|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3| +0#0000000&@5 +|~+0#4040ff13&| @28 +|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@17 |