Mercurial > vim
comparison src/testdir/test_diffmode.vim @ 25517:b04e76e66128 v8.2.3295
patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Commit: https://github.com/vim/vim/commit/4f33bc20d7d5444e44d13f954e8219ad1abd26ef
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu Aug 5 17:57:02 2021 +0200
patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Problem: 'cursorline' should not apply to 'breakindent'.
Solution: Make 'cursorline' apply to 'breakindent' and 'showbreak'
consistently. (closes #8684)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 05 Aug 2021 18:00:05 +0200 |
| parents | 13812db714fa |
| children | d3f992bc6ef8 |
comparison
equal
deleted
inserted
replaced
| 25516:3abc660b43f4 | 25517:b04e76e66128 |
|---|---|
| 1016 " clean up | 1016 " clean up |
| 1017 call StopVimInTerminal(buf) | 1017 call StopVimInTerminal(buf) |
| 1018 call delete('Xtest_diff_cursorline') | 1018 call delete('Xtest_diff_cursorline') |
| 1019 endfunc | 1019 endfunc |
| 1020 | 1020 |
| 1021 func Test_diff_with_cursorline_breakindent() | |
| 1022 CheckScreendump | |
| 1023 | |
| 1024 call writefile([ | |
| 1025 \ 'hi CursorLine ctermbg=red ctermfg=white', | |
| 1026 \ 'set noequalalways wrap diffopt=followwrap cursorline breakindent', | |
| 1027 \ '50vnew', | |
| 1028 \ 'call setline(1, [" "," "," "," "])', | |
| 1029 \ 'exe "norm 20Afoo\<Esc>j20Afoo\<Esc>j20Afoo\<Esc>j20Abar\<Esc>"', | |
| 1030 \ 'vnew', | |
| 1031 \ 'call setline(1, [" "," "," "," "])', | |
| 1032 \ 'exe "norm 20Abee\<Esc>j20Afoo\<Esc>j20Afoo\<Esc>j20Abaz\<Esc>"', | |
| 1033 \ 'windo diffthis', | |
| 1034 \ '2wincmd w', | |
| 1035 \ ], 'Xtest_diff_cursorline_breakindent') | |
| 1036 let buf = RunVimInTerminal('-S Xtest_diff_cursorline_breakindent', {}) | |
| 1037 | |
| 1038 call term_sendkeys(buf, "gg0") | |
| 1039 call VerifyScreenDump(buf, 'Test_diff_with_cul_bri_01', {}) | |
| 1040 call term_sendkeys(buf, "j") | |
| 1041 call VerifyScreenDump(buf, 'Test_diff_with_cul_bri_02', {}) | |
| 1042 call term_sendkeys(buf, "j") | |
| 1043 call VerifyScreenDump(buf, 'Test_diff_with_cul_bri_03', {}) | |
| 1044 call term_sendkeys(buf, "j") | |
| 1045 call VerifyScreenDump(buf, 'Test_diff_with_cul_bri_04', {}) | |
| 1046 | |
| 1047 " clean up | |
| 1048 call StopVimInTerminal(buf) | |
| 1049 call delete('Xtest_diff_cursorline_breakindent') | |
| 1050 endfunc | |
| 1051 | |
| 1021 func Test_diff_with_syntax() | 1052 func Test_diff_with_syntax() |
| 1022 CheckScreendump | 1053 CheckScreendump |
| 1023 | 1054 |
| 1024 let lines =<< trim END | 1055 let lines =<< trim END |
| 1025 void doNothing() { | 1056 void doNothing() { |