diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-07-14 08:17:49 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2024-07-14 13:39:40 +0800 |
| commit | ba36742211eea55bed2ffbca129a45023967f204 (patch) | |
| tree | 788badd75a8c8f673a0f4fa7e498112320388f01 /src | |
| parent | 9093fbdd026f088d923fea374a96a8b01ca0df3a (diff) | |
| download | rneovim-ba36742211eea55bed2ffbca129a45023967f204.tar.gz rneovim-ba36742211eea55bed2ffbca129a45023967f204.tar.bz2 rneovim-ba36742211eea55bed2ffbca129a45023967f204.zip | |
vim-patch:9.1.0574: ex: wrong handling of commands after bar
Problem: ex: wrong handling of commands after bar
Solution: for :append, :insert and :change use the text after the bar
as input for those commands. This is what POSIX requests.
(Mohamed Akram)
See the POSIX Spec:
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ex.html#tag_20_40_13_03
Section 12.c
closes: vim/vim#15229
https://github.com/vim/vim/commit/8c446da34998f6350911e07fbfd7932412c83185
Co-authored-by: Mohamed Akram <mohd.akram@outlook.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds.c | 6 | ||||
| -rw-r--r-- | src/nvim/ex_docmd.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 0aa897105e..e4e9075afa 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -2784,7 +2784,11 @@ void ex_append(exarg_T *eap) indent = get_indent_lnum(lnum); } } - if (eap->ea_getline == NULL) { + if (*eap->arg == '|') { + // Get the text after the trailing bar. + theline = xstrdup(eap->arg + 1); + *eap->arg = NUL; + } else if (eap->ea_getline == NULL) { // No getline() function, use the lines that follow. This ends // when there is no more. if (eap->nextcmd == NULL || *eap->nextcmd == NUL) { diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 6fae8f091e..1d20829d3c 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -4108,7 +4108,12 @@ void separate_nextcmd(exarg_T *eap) && !(eap->argt & EX_NOTRLCOM) && (eap->cmdidx != CMD_at || p != eap->arg) && (eap->cmdidx != CMD_redir - || p != eap->arg + 1 || p[-1] != '@')) || *p == '|' || *p == '\n') { + || p != eap->arg + 1 || p[-1] != '@')) + || (*p == '|' + && eap->cmdidx != CMD_append + && eap->cmdidx != CMD_change + && eap->cmdidx != CMD_insert) + || *p == '\n') { // We remove the '\' before the '|', unless EX_CTRLV is used // AND 'b' is present in 'cpoptions'. if ((vim_strchr(p_cpo, CPO_BAR) == NULL |