diff options
| author | Felipe Morales <hel.sheep@gmail.com> | 2015-06-08 16:47:10 -0300 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-08-30 23:40:12 -0400 |
| commit | acdac914d554fae421c4e71c9d1dffc5cea4505b (patch) | |
| tree | 8d688d11f9aaea5538991a31a4796ff7aaef87aa /src/nvim/option.c | |
| parent | 7ee94d2dd7ad7c67bb6204fc6b563d2d856b4d58 (diff) | |
| download | rneovim-acdac914d554fae421c4e71c9d1dffc5cea4505b.tar.gz rneovim-acdac914d554fae421c4e71c9d1dffc5cea4505b.tar.bz2 rneovim-acdac914d554fae421c4e71c9d1dffc5cea4505b.zip | |
clipboard: avoid clipboard during :global. #2809
This is equivalent to patches 7.4.396, 7.4.445 and 7.4.598.
vim-patch:7.4.396
Problem: When 'clipboard' is "unnamed", :g/pat/d is very slow.
(Praful)
Solution: Only set the clipboard after the last delete. (Christian
Brabandt)
https://github.com/vim/vim/commit/1f285eb49a709e00552f7bef7e74efff5ae79026
vim-patch:7.4.445
Problem: Clipboard may be cleared on startup.
Solution: Set clip_did_set_selection to -1 during startup. (Christian
Brabandt)
https://github.com/vim/vim/commit/1a19d37d90f037c09183ba68fdddf70ab8ee179a
vim-patch:7.4.598
Problem: ":tabdo windo echo 'hi'" causes "* register not to be
changed.
(Salman Halim)
Solution: Change how clip_did_set_selection is used and add
clipboard_needs_update and global_change_count. (Christian
Brabandt)
https://github.com/vim/vim/commit/af6a579263a688f30bfbbee72b28d08cc7e0f3d4
Co-Author: @bfredl
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 38682f3142..ee50567728 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2583,11 +2583,11 @@ did_set_string_option ( else if (varp == &p_ead) { if (check_opt_strings(p_ead, p_ead_values, FALSE) != OK) errmsg = e_invarg; - } - else if (varp == &p_cb) { - if (opt_strings_flags(p_cb, p_cb_values, &cb_flags, TRUE) != OK) + } else if (varp == &p_cb) { // 'clipboard' + if (opt_strings_flags(p_cb, p_cb_values, &cb_flags, true) != OK) { errmsg = e_invarg; - } else if (varp == &(curwin->w_s->b_p_spl) + } + } else if (varp == &(curwin->w_s->b_p_spl) // 'spell' || varp == &(curwin->w_s->b_p_spf)) { // When 'spelllang' or 'spellfile' is set and there is a window for this // buffer in which 'spell' is set load the wordlists. |