diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-12-24 07:55:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-24 07:55:03 +0800 |
| commit | 3b9bd7bd439a31f393746e01e25291dd0543630d (patch) | |
| tree | 46627d70f3c517991744caf0cd8def202441b7ed /src/nvim/ex_cmds.c | |
| parent | 3ea1524cf8a7d80d1034011462fd9611fdf385f1 (diff) | |
| download | rneovim-3b9bd7bd439a31f393746e01e25291dd0543630d.tar.gz rneovim-3b9bd7bd439a31f393746e01e25291dd0543630d.tar.bz2 rneovim-3b9bd7bd439a31f393746e01e25291dd0543630d.zip | |
vim-patch:9.0.1092: search error message doesn't show used pattern (#21518)
Problem: Search error message doesn't show used pattern.
Solution: Pass the actually used pattern to where the error message is
given. (Rob Pilling, closes vim/vim#11742)
https://github.com/vim/vim/commit/e86190e7c1297da29d0fc2415fdeca5ecae8d2ba
Co-authored-by: Rob Pilling <robpilling@gmail.com>
Diffstat (limited to 'src/nvim/ex_cmds.c')
| -rw-r--r-- | src/nvim/ex_cmds.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 5eb5359e90..4167d1d182 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -1618,12 +1618,12 @@ static int check_writable(const char *fname) } #endif -/// write current buffer to file 'eap->arg' -/// if 'eap->append' is true, append to the file +/// Write current buffer to file "eap->arg". +/// If "eap->append" is true, append to the file. /// -/// if *eap->arg == NUL write to current file +/// If "*eap->arg == NUL" write to current file. /// -/// @return FAIL for failure, OK otherwise +/// @return FAIL for failure, OK otherwise. int do_write(exarg_T *eap) { int other; @@ -3443,8 +3443,8 @@ static int do_sub(exarg_T *eap, proftime_T timeout, long cmdpreview_ns, handle_T return 0; } - if (search_regcomp((char_u *)pat, RE_SUBST, which_pat, (cmdpreview ? 0 : SEARCH_HIS), - ®match) == FAIL) { + if (search_regcomp((char_u *)pat, NULL, RE_SUBST, which_pat, + (cmdpreview ? 0 : SEARCH_HIS), ®match) == FAIL) { if (subflags.do_error) { emsg(_(e_invcmd)); } @@ -4398,7 +4398,9 @@ void ex_global(exarg_T *eap) } } - if (search_regcomp((char_u *)pat, RE_BOTH, which_pat, SEARCH_HIS, ®match) == FAIL) { + char_u *used_pat; + if (search_regcomp((char_u *)pat, &used_pat, RE_BOTH, which_pat, + SEARCH_HIS, ®match) == FAIL) { emsg(_(e_invcmd)); return; } @@ -4429,9 +4431,9 @@ void ex_global(exarg_T *eap) msg(_(e_interr)); } else if (ndone == 0) { if (type == 'v') { - smsg(_("Pattern found in every line: %s"), pat); + smsg(_("Pattern found in every line: %s"), used_pat); } else { - smsg(_("Pattern not found: %s"), pat); + smsg(_("Pattern not found: %s"), used_pat); } } else { global_exe(cmd); |