[vim/vim] Fix cmdwin cursor position and prefix on wrapped lines (PR #19964)
h_east
When opening the command-line window with CTRL-F after typing a command that fills the screen width, the cursor was placed past the end of the line. Add check_cursor() after setting State to MODE_NORMAL so the cursor is adjusted to the last character.
Also fix the cmdwin prefix character (e.g. ':') being drawn on wrapped continuation rows. It should only appear on the first screen row of each buffer line.
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/19964
Commit Summary
- 7a61c5c Fix cmdwin cursor position and prefix on wrapped lines
File Changes
(3 files)
- M src/drawline.c (5)
- M src/ex_getln.c (1)
- M src/testdir/test_cmdwin.vim (34)
Patch Links:
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
zeertzjq
@zeertzjq commented on this pull request.
In src/drawline.c:
> @@ -2051,9 +2051,10 @@ win_line(
if (wlv.draw_state == WL_CMDLINE - 1 && wlv.n_extra == 0)
{
wlv.draw_state = WL_CMDLINE;
- if (wp == cmdwin_win)
+ if (wp == cmdwin_win && wlv.row == wlv.startrow)
Shouldn't an empty space be drawn on continuation rows instead? Otherwise continuation rows will be offset by 1 cell to the left.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
h_east
@h-east commented on this pull request.
In src/drawline.c:
> @@ -2051,9 +2051,10 @@ win_line(
if (wlv.draw_state == WL_CMDLINE - 1 && wlv.n_extra == 0)
{
wlv.draw_state = WL_CMDLINE;
- if (wp == cmdwin_win)
+ if (wp == cmdwin_win && wlv.row == wlv.startrow)
Fair point.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
h_east
@h-east pushed 1 commit.
- d63a231 Fix cmdwin cursor position and prefix on wrapped lines
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
chrisbra left a comment (vim/vim#19964)thanks
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.