Mercurial > vim
changeset 10565:ea0dadb041c9 v8.0.0172
patch 8.0.0172: command line window does not work
commit https://github.com/vim/vim/commit/1d669c233c97486555a34f7d3f069068d9ebdb63
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jan 11 22:40:19 2017 +0100
patch 8.0.0172: command line window does not work
Problem: The command selected in the command line window is not executed.
(Andrey Starodubtsev)
Solution: Save and restore the command line at a lower level. (closes #1370)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 11 Jan 2017 22:45:04 +0100 |
| parents | 4039ed145cfa |
| children | 6d6bbf3be706 |
| files | src/ex_getln.c src/testdir/test_history.vim src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -773,9 +773,7 @@ getcmdline( /* * Open a window to edit the command line (and history). */ - save_cmdline(&save_ccline); c = ex_window(); - restore_cmdline(&save_ccline); some_key_typed = TRUE; } } @@ -6904,9 +6902,7 @@ ex_window(void) redraw_later(SOME_VALID); /* Save the command line info, can be used recursively. */ - save_ccline = ccline; - ccline.cmdbuff = NULL; - ccline.cmdprompt = NULL; + save_cmdline(&save_ccline); /* No Ex mode here! */ exmode_active = 0; @@ -6953,7 +6949,7 @@ ex_window(void) # endif /* Restore the command line info. */ - ccline = save_ccline; + restore_cmdline(&save_ccline); cmdwin_type = 0; exmode_active = save_exmode;
--- a/src/testdir/test_history.vim +++ b/src/testdir/test_history.vim @@ -87,3 +87,20 @@ function Test_History() call assert_equal(-1, histnr('abc')) call assert_fails('call histnr([])', 'E730:') endfunction + +function Test_Search_history_window() + new + call setline(1, ['a', 'b', 'a', 'b']) + 1 + call feedkeys("/a\<CR>", 'xt') + call assert_equal('a', getline('.')) + 1 + call feedkeys("/b\<CR>", 'xt') + call assert_equal('b', getline('.')) + 1 + " select the previous /a command + call feedkeys("q/kk\<CR>", 'x!') + call assert_equal('a', getline('.')) + call assert_equal('a', @/) + bwipe! +endfunc