aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_cmds.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-04-03 20:38:31 +0800
committerGitHub <noreply@github.com>2022-04-03 20:38:31 +0800
commitd73bf3138a802bb6c1c654cd913d4e91932287f8 (patch)
tree739de02b0003e666042c124451e1a90bc87b399f /src/nvim/ex_cmds.c
parente9e16655af1bacd4b1499fed00a142512c120710 (diff)
downloadrneovim-d73bf3138a802bb6c1c654cd913d4e91932287f8.tar.gz
rneovim-d73bf3138a802bb6c1c654cd913d4e91932287f8.tar.bz2
rneovim-d73bf3138a802bb6c1c654cd913d4e91932287f8.zip
vim-patch:8.2.4672: using :normal with Ex mode may make :substitute hang (#17983)
Problem: Using :normal with Ex mode may make :substitute hang. Solution: When getting an empty line behave like 'q' was typed. (closes vim/vim#10070) https://github.com/vim/vim/commit/ce416b453a849c837f9f6ffc91dd4792d84e1bfd Cherry-pick a comment from patch 8.2.0363.
Diffstat (limited to 'src/nvim/ex_cmds.c')
-rw-r--r--src/nvim/ex_cmds.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index ff803c3553..b493ad61ae 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -3867,6 +3867,12 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
if (resp != NULL) {
typed = *resp;
xfree(resp);
+ // When ":normal" runs out of characters we get
+ // an empty line. Use "q" to get out of the
+ // loop.
+ if (ex_normal_busy && typed == NUL) {
+ typed = 'q';
+ }
}
} else {
char_u *orig_line = NULL;