Mercurial > vim
changeset 23021:d10a37eb91ee v8.2.2057
patch 8.2.2057: getting the selection may trigger TextYankPost autocmd
Commit: https://github.com/vim/vim/commit/fccbf068f8c85474db8d8dead1530321d1f3e5b8
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 26 20:34:00 2020 +0100
patch 8.2.2057: getting the selection may trigger TextYankPost autocmd
Problem: Getting the selection may trigger TextYankPost autocmd.
Solution: Only trigger the autocommand when yanking in Vim, not for getting
the selection. (closes #7367)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 26 Nov 2020 20:45:03 +0100 |
| parents | 61decb85346b |
| children | feae46642f33 |
| files | src/clipboard.c src/normal.c src/register.c src/testdir/test_autocmd.vim src/version.c |
| diffstat | 5 files changed, 62 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/clipboard.c +++ b/src/clipboard.c @@ -2025,6 +2025,9 @@ clip_get_selection(Clipboard_T *cbd) && get_y_register(STAR_REGISTER)->y_array != NULL)) return; + // Avoid triggering autocmds such as TextYankPost. + block_autocmds(); + // Get the text between clip_star.start & clip_star.end old_y_previous = get_y_previous(); old_y_current = get_y_current(); @@ -2054,6 +2057,8 @@ clip_get_selection(Clipboard_T *cbd) curbuf->b_op_end = old_op_end; VIsual = old_visual; VIsual_mode = old_visual_mode; + + unblock_autocmds(); } else if (!is_clipboard_needs_update()) {
--- a/src/normal.c +++ b/src/normal.c @@ -1325,6 +1325,26 @@ check_visual_highlight(void) } } +#if defined(FEAT_CLIPBOARD) && defined(FEAT_EVAL) +/* + * Call yank_do_autocmd() for "regname". + */ + static void +call_yank_do_autocmd(int regname) +{ + oparg_T oa; + yankreg_T *reg; + + clear_oparg(&oa); + oa.regname = regname; + oa.op_type = OP_YANK; + oa.is_VIsual = TRUE; + reg = get_register(regname, TRUE); + yank_do_autocmd(&oa, reg); + free_register(reg); +} +#endif + /* * End Visual mode. * This function should ALWAYS be called to end Visual mode, except from @@ -1342,6 +1362,18 @@ end_visual_mode(void) */ if (clip_star.available && clip_star.owned) clip_auto_select(); + +# if defined(FEAT_EVAL) + // Emit a TextYankPost for the automatic copy of the selection into the + // star and/or plus register. + if (has_textyankpost()) + { + if (clip_isautosel_star()) + call_yank_do_autocmd('*'); + if (clip_isautosel_plus()) + call_yank_do_autocmd('+'); + } +# endif #endif VIsual_active = FALSE;
--- a/src/register.c +++ b/src/register.c @@ -322,8 +322,7 @@ put_register(int name, void *reg) #endif } -#if (defined(FEAT_CLIPBOARD) && defined(FEAT_X11) && defined(USE_SYSTEM)) \ - || defined(PROTO) +#if defined(FEAT_CLIPBOARD) || defined(PROTO) void free_register(void *reg) {
--- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -1760,6 +1760,28 @@ func Test_TextYankPost() call assert_equal({}, v:event) + if has('clipboard_working') && !has('gui_running') + " Test that when the visual selection is automatically copied to clipboard + " register a TextYankPost is emitted + call setline(1, ['foobar']) + + let @* = '' + set clipboard=autoselect + exe "norm! ggviw\<Esc>" + call assert_equal( + \{'regcontents': ['foobar'], 'regname': '*', 'operator': 'y', 'regtype': 'v', 'visual': v:true}, + \g:event) + + let @+ = '' + set clipboard=autoselectplus + exe "norm! ggviw\<Esc>" + call assert_equal( + \{'regcontents': ['foobar'], 'regname': '+', 'operator': 'y', 'regtype': 'v', 'visual': v:true}, + \g:event) + + set clipboard&vim + endif + au! TextYankPost unlet g:event bwipe!