diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-29 18:29:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-29 18:29:54 +0100 |
| commit | e73f911c53de1c87e39456ba20782f72a0ca8f4f (patch) | |
| tree | 1749ce3b701e1bd85465ff8e1b3d628a4d552a4e | |
| parent | 8ee4c01b8c79a29065c1af05e5d9c0721069765f (diff) | |
| download | vim-git-e73f911c53de1c87e39456ba20782f72a0ca8f4f.tar.gz | |
patch 8.1.1073: space in number column is on wrong side with 'rightleft' setv8.1.1073
Problem: Space in number column is on wrong side with 'rightleft' set.
Solution: Move the space to the text side. Add a test.
| -rw-r--r-- | src/screen.c | 14 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_diff_of_diff_02.dump | 20 | ||||
| -rw-r--r-- | src/testdir/test_diffmode.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 38 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c index d5e8e295c..7706b6c58 100644 --- a/src/screen.c +++ b/src/screen.c @@ -3896,7 +3896,19 @@ win_line( *p_extra = '-'; #ifdef FEAT_RIGHTLEFT if (wp->w_p_rl) /* reverse line numbers */ - rl_mirror(extra); + { + char_u *p1, *p2; + int t; + + // like rl_mirror(), but keep the space at the end + p2 = skiptowhite(extra) - 1; + for (p1 = extra; p1 < p2; ++p1, --p2) + { + t = *p1; + *p1 = *p2; + *p2 = t; + } + } #endif p_extra = extra; c_extra = NUL; diff --git a/src/testdir/dumps/Test_diff_of_diff_02.dump b/src/testdir/dumps/Test_diff_of_diff_02.dump new file mode 100644 index 000000000..86c06f555 --- /dev/null +++ b/src/testdir/dumps/Test_diff_of_diff_02.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@28|a>a| +0#af5f00255&|1| @1| +0#0000e05#a8a8a8255@1||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0@1| @32 +@29|b@1| +0#af5f00255&|2| @1| +0#0000e05#a8a8a8255@1||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|b+0#0000000#ffffff0@1| @32 +@29|c@1| +0#af5f00255&|3| @1| +0#0000e05#a8a8a8255@1||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|c+0#0000000#ffffff0@1| @32 +|-+0#4040ff13#afffff255@30| +0#af5f00255#ffffff0@3| +0#0000e05#a8a8a8255@1||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|@+0#0000000#5fd7ff255@1| |-|3|,|2| |+|5|,|7| |@@1| @19 +|-+0#4040ff13#afffff255@30| +0#af5f00255#ffffff0@3| +0#0000e05#a8a8a8255@1||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|d+0#0000000#5fd7ff255@1| @32 +|-+0#4040ff13#afffff255@30| +0#af5f00255#ffffff0@3| +0#0000e05#a8a8a8255@1||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|e+0#0000000#5fd7ff255@1| @32 +|-+0#4040ff13#afffff255@30| +0#af5f00255#ffffff0@3| +0#0000e05#a8a8a8255@1||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|f+0#0000000#5fd7ff255@1| @32 +| +0#4040ff13#ffffff0@35|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +@36|~||+1#0000000&|~+0#4040ff13&| @35 +|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1 +|:+0&&|s|e|t| |r|i|g|h|t|l|e|f|t| @60 diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index 85963311a..81913c89a 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -922,6 +922,9 @@ func Test_diff_of_diff() call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {}) + call term_sendkeys(buf, ":set rightleft\<cr>") + call VerifyScreenDump(buf, 'Test_diff_of_diff_02', {}) + " clean up call StopVimInTerminal(buf) call delete('Xtest_diff_diff') diff --git a/src/version.c b/src/version.c index e5559c715..192113192 100644 --- a/src/version.c +++ b/src/version.c @@ -776,6 +776,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1073, +/**/ 1072, /**/ 1071, |