diff options
author | zeertzjq <zeertzjq@outlook.com> | 2022-07-07 04:47:18 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-07 04:47:18 +0800 |
commit | 664efa497e4e3d79d2e4ab486acbf1471b2389b0 (patch) | |
tree | 389a04a3846cf3d5df7464b03294be48302ee09e /src/nvim/globals.h | |
parent | 1e03255646be3a31d44db4118ee2194d45f6bf1c (diff) | |
download | rneovim-664efa497e4e3d79d2e4ab486acbf1471b2389b0.tar.gz rneovim-664efa497e4e3d79d2e4ab486acbf1471b2389b0.tar.bz2 rneovim-664efa497e4e3d79d2e4ab486acbf1471b2389b0.zip |
vim-patch:8.2.0614: get ml_get error when deleting a line in 'completefunc' (#19244)
Problem: Get ml_get error when deleting a line in 'completefunc'. (Yegappan
Lakshmanan)
Solution: Lock the text while evaluating 'completefunc'.
https://github.com/vim/vim/commit/ff06f283e3e4b3ec43012dd3b83f8454c98f6639
Fix a mistake in the porting of patch 8.1.0098.
Cherry-pick Test_run_excmd_with_text_locked() from patch 8.2.0270.
Cherry-pick test_gf.vim changes from patch 8.2.0369.
Cherry-pick message change from later patches.
Diffstat (limited to 'src/nvim/globals.h')
-rw-r--r-- | src/nvim/globals.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index f3f60ebfb7..0281eebcee 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -509,7 +509,7 @@ EXTERN int full_screen INIT(= false); /// .vimrc in current directory. EXTERN int secure INIT(= 0); -/// Non-zero when changing text and jumping to another window/buffer is not +/// Non-zero when changing text and jumping to another window or editing another buffer is not /// allowed. EXTERN int textlock INIT(= 0); @@ -955,6 +955,7 @@ EXTERN char e_listdictblobarg[] INIT(= N_("E896: Argument of %s must be a List, EXTERN char e_readerrf[] INIT(= N_("E47: Error while reading errorfile")); EXTERN char e_sandbox[] INIT(= N_("E48: Not allowed in sandbox")); EXTERN char e_secure[] INIT(= N_("E523: Not allowed here")); +EXTERN char e_textlock[] INIT(= N_("E565: Not allowed to change text or change window")); EXTERN char e_screenmode[] INIT(= N_("E359: Screen mode setting not supported")); EXTERN char e_scroll[] INIT(= N_("E49: Invalid scroll size")); EXTERN char e_shellempty[] INIT(= N_("E91: 'shell' option is empty")); |