Mercurial > vim
changeset 22934:3f04c2cf0ced v8.2.2014
patch 8.2.2014: using CTRL-O in a prompt buffer moves cursor to start
Commit: https://github.com/vim/vim/commit/ee8b787bcd15f63a938243770065e704c9b5c85f
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 19 18:46:25 2020 +0100
patch 8.2.2014: using CTRL-O in a prompt buffer moves cursor to start
Problem: Using CTRL-O in a prompt buffer moves cursor to start of the line.
Solution: Do not move the cursor when restarting edit. (closes https://github.com/vim/vim/issues/7330)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 19 Nov 2020 19:00:05 +0100 |
| parents | f5066b74b9af |
| children | da7ce666cf1f |
| files | src/job.c src/testdir/test_prompt_buffer.vim src/version.c |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/job.c +++ b/src/job.c @@ -1628,7 +1628,7 @@ init_prompt(int cmdchar_todo) if (cmdchar_todo == 'A') coladvance((colnr_T)MAXCOL); - if (cmdchar_todo == 'I' || curwin->w_cursor.col <= (int)STRLEN(prompt)) + if (curwin->w_cursor.col < (int)STRLEN(prompt)) curwin->w_cursor.col = (int)STRLEN(prompt); // Make sure the cursor is in a valid position. check_cursor();
--- a/src/testdir/test_prompt_buffer.vim +++ b/src/testdir/test_prompt_buffer.vim @@ -85,9 +85,12 @@ func Test_prompt_editing() call term_sendkeys(buf, left . left . left . bs . '-') call WaitForAssert({-> assert_equal('cmd: -hel', term_getline(buf, 1))}) + call term_sendkeys(buf, "\<C-O>lz") + call WaitForAssert({-> assert_equal('cmd: -hzel', term_getline(buf, 1))}) + let end = "\<End>" call term_sendkeys(buf, end . "x") - call WaitForAssert({-> assert_equal('cmd: -helx', term_getline(buf, 1))}) + call WaitForAssert({-> assert_equal('cmd: -hzelx', term_getline(buf, 1))}) call term_sendkeys(buf, "\<C-U>exit\<CR>") call WaitForAssert({-> assert_equal('other buffer', term_getline(buf, 1))})