Mercurial > vim
view runtime/ftplugin/gitrebase.vim @ 33017:7d0357f70cf8 v9.0.1800
patch 9.0.1800: Cursor position still wrong with 'showbreak' and virtual text
Commit: https://github.com/vim/vim/commit/6a3897232aecd3e8b9e8b23955e55c1993e5baec
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sun Aug 27 19:04:14 2023 +0200
patch 9.0.1800: Cursor position still wrong with 'showbreak' and virtual text
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>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 27 Aug 2023 19:15:05 +0200 |
parents | 3e661b0cf500 |
children |
line wrap: on
line source
" Vim filetype plugin " Language: git rebase --interactive " Maintainer: Tim Pope <vimNOSPAM@tpope.org> " Last Change: 2022 Jan 05 " Only do this when not done yet for this buffer if (exists("b:did_ftplugin")) finish endif let b:did_ftplugin = 1 let &l:comments = ':' . (matchstr(getline('$'), '^[#;@!$%^&|:]\S\@!') . '#')[0] let &l:commentstring = &l:comments[1] . ' %s' setlocal formatoptions-=t setlocal nomodeline let b:undo_ftplugin = "setl com< cms< fo< ml<" function! s:choose(word) abort s/^\(\w\+\>\)\=\(\s*\)\ze\x\{4,40\}\>/\=(strlen(submatch(1)) == 1 ? a:word[0] : a:word) . substitute(submatch(2),'^$',' ','')/e endfunction function! s:cycle(count) abort let words = ['pick', 'edit', 'fixup', 'squash', 'reword', 'drop'] let index = index(map(copy(words), 'v:val[0]'), getline('.')[0]) let index = ((index < 0 ? 0 : index) + 10000 * len(words) + a:count) % len(words) call s:choose(words[index]) endfunction command! -buffer -bar -range Pick :<line1>,<line2>call s:choose('pick') command! -buffer -bar -range Squash :<line1>,<line2>call s:choose('squash') command! -buffer -bar -range Edit :<line1>,<line2>call s:choose('edit') command! -buffer -bar -range Reword :<line1>,<line2>call s:choose('reword') command! -buffer -bar -range Fixup :<line1>,<line2>call s:choose('fixup') command! -buffer -bar -range Drop :<line1>,<line2>call s:choose('drop') command! -buffer -count=1 -bar -bang Cycle call s:cycle(<bang>0 ? -<count> : <count>) if exists("g:no_plugin_maps") || exists("g:no_gitrebase_maps") finish endif nnoremap <buffer> <silent> <C-A> :<C-U><C-R>=v:count1<CR>Cycle<CR> nnoremap <buffer> <silent> <C-X> :<C-U><C-R>=v:count1<CR>Cycle!<CR> let b:undo_ftplugin = b:undo_ftplugin . "|exe 'nunmap <buffer> <C-A>'|exe 'nunmap <buffer> <C-X>'"