Commit: patch 9.1.0651: ex: trailing dot is optional for :g and :insert/:append

4 views
Skip to first unread message

Christian Brabandt

unread,
Aug 1, 2024, 5:00:13 PM8/1/24
to vim...@googlegroups.com
patch 9.1.0651: ex: trailing dot is optional for :g and :insert/:append

Commit: https://github.com/vim/vim/commit/0214680a8ec5f7f656cb42e5db19243709202ed2
Author: Mohamed Akram <mohd....@outlook.com>
Date: Thu Aug 1 22:53:01 2024 +0200

patch 9.1.0651: ex: trailing dot is optional for :g and :insert/:append

Problem: ex: trailing dot is optional for :g and :insert/:append
Solution: don't break out early, when the next command is empty.
(Mohamed Akram)

The terminating period is optional for the last command in a global
command list.

closes: #15407

Signed-off-by: Mohamed Akram <mohd....@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index c36593798..479373756 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3370,7 +3370,7 @@ ex_append(exarg_T *eap)
{
// No getline() function, use the lines that follow. This ends
// when there is no more.
- if (eap->nextcmd == NULL || *eap->nextcmd == NUL)
+ if (eap->nextcmd == NULL)
break;
p = vim_strchr(eap->nextcmd, NL);
if (p == NULL)
@@ -3378,6 +3378,8 @@ ex_append(exarg_T *eap)
theline = vim_strnsave(eap->nextcmd, p - eap->nextcmd);
if (*p != NUL)
++p;
+ else
+ p = NULL;
eap->nextcmd = p;
}
else
diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim
index a1ec15d7e..aa949355f 100644
--- a/src/testdir/test_ex_mode.vim
+++ b/src/testdir/test_ex_mode.vim
@@ -378,4 +378,13 @@ func Test_insert_after_trailing_bar()
bwipe!
endfunc

+" Test global insert of a newline without terminating period
+func Test_global_insert_newline()
+ new
+ call setline(1, ['foo'])
+ call feedkeys("Qg/foo/i\
", "xt")
+ call assert_equal(['', 'foo'], getline(1, '$'))
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index c8527db60..07622ac3d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 651,
/**/
650,
/**/
Reply all
Reply to author
Forward
0 new messages