Mercurial > vim
changeset 15973:393a9a3a2da2 v8.1.0992
patch 8.1.0992: a :normal command resets the reg_executing() result
commit https://github.com/vim/vim/commit/cce713ddcc0c9ab29926c28e287cbb587a959b08
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Mar 4 11:40:12 2019 +0100
patch 8.1.0992: a :normal command resets the reg_executing() result
Problem: A :normal command while executing a register resets the
reg_executing() result.
Solution: Save and restore reg_executing. (closes #4066)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 04 Mar 2019 11:45:07 +0100 |
| parents | 1b570dab3589 |
| children | 7d3d7e407216 |
| files | src/ex_docmd.c src/structs.h src/testdir/test_functions.vim src/version.c |
| diffstat | 4 files changed, 25 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -10260,6 +10260,7 @@ save_current_state(save_state_T *sst) sst->save_insertmode = p_im; sst->save_finish_op = finish_op; sst->save_opcount = opcount; + sst->save_reg_executing = reg_executing; msg_scroll = FALSE; /* no msg scrolling in Normal mode */ restart_edit = 0; /* don't go to Insert mode */ @@ -10285,6 +10286,7 @@ restore_current_state(save_state_T *sst) p_im = sst->save_insertmode; finish_op = sst->save_finish_op; opcount = sst->save_opcount; + reg_executing = sst->save_reg_executing; msg_didout |= sst->save_msg_didout; /* don't reset msg_didout now */ /* Restore the state (needed when called from a function executed for
--- a/src/structs.h +++ b/src/structs.h @@ -2625,19 +2625,19 @@ typedef struct w_line */ struct frame_S { - char fr_layout; /* FR_LEAF, FR_COL or FR_ROW */ + char fr_layout; // FR_LEAF, FR_COL or FR_ROW int fr_width; - int fr_newwidth; /* new width used in win_equal_rec() */ + int fr_newwidth; // new width used in win_equal_rec() int fr_height; - int fr_newheight; /* new height used in win_equal_rec() */ - frame_T *fr_parent; /* containing frame or NULL */ - frame_T *fr_next; /* frame right or below in same parent, NULL - for first */ - frame_T *fr_prev; /* frame left or above in same parent, NULL - for last */ - /* fr_child and fr_win are mutually exclusive */ - frame_T *fr_child; /* first contained frame */ - win_T *fr_win; /* window that fills this frame */ + int fr_newheight; // new height used in win_equal_rec() + frame_T *fr_parent; // containing frame or NULL + frame_T *fr_next; // frame right or below in same parent, NULL + // for last + frame_T *fr_prev; // frame left or above in same parent, NULL + // for first + // fr_child and fr_win are mutually exclusive + frame_T *fr_child; // first contained frame + win_T *fr_win; // window that fills this frame }; #define FR_LEAF 0 /* frame is a leaf */ @@ -3527,6 +3527,7 @@ typedef struct { int save_insertmode; int save_finish_op; int save_opcount; + int save_reg_executing; tasave_T tabuf; } save_state_T;
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1137,6 +1137,15 @@ func Test_reg_executing_and_recording() call feedkeys("q\"\"=s:save_reg_stat()\<CR>pq", 'xt') call assert_equal('":', s:reg_stat) + " :normal command saves and restores reg_executing + let @q = ":call TestFunc()\<CR>:call s:save_reg_stat()\<CR>" + func TestFunc() abort + normal! ia + endfunc + call feedkeys("@q", 'xt') + call assert_equal(':q', s:reg_stat) + delfunc TestFunc + bwipe! delfunc s:save_reg_stat unlet s:reg_stat