IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23377 from zeertzjq/vim-9.0.1336

Browse Source 
vim-patch:9.0.{1336,1372}
This commit is contained in:
zeertzjq 2023-04-28 23:58:31 +08:00 committed by GitHub
commit 4720f4379a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/normal.c
View File

@ -956,7 +956,7 @@ normal_end:
set_reg_var(get_default_register_name());
}
s->c = finish_op;
const bool prev_finish_op = finish_op;
if (s->oa.op_type == OP_NOP) {
// Reset finish_op, in case it was set
finish_op = false;
@ -964,7 +964,7 @@ normal_end:
}
// Redraw the cursor with another shape, if we were in Operator-pending
// mode or did a replace command.
if (s->c || s->ca.cmdchar == 'r'
if (prev_finish_op || s->ca.cmdchar == 'r'
|| (s->ca.cmdchar == 'g' && s->ca.nchar == 'r')) {
ui_cursor_shape(); // may show different cursor shape
}

5
src/nvim/option_defs.h
View File

@ -1026,6 +1026,11 @@ typedef struct {
void *os_buf;
} optset_T;
/// Type for the callback function that is invoked after an option value is
/// changed to validate and apply the new value.
///
/// Returns NULL if the option value is valid and successfully applied.
/// Otherwise returns an error message.
typedef const char *(*opt_did_set_cb_T)(optset_T *args);
/// Stores an identifier of a script or channel that last set an option.

2
test/old/testdir/test_options.vim
View File

@ -1482,6 +1482,8 @@ func Test_string_option_revert_on_failure()
endif
if exists('+toolbar')
call add(optlist, ['toolbar', 'text', 'a123'])
endif
if exists('+toolbariconsize')
call add(optlist, ['toolbariconsize', 'medium', 'a123'])
endif
if exists('+ttymouse') && !has('gui')