patch 9.1.0535: newline escape wrong in ex mode
Commit:
https://github.com/vim/vim/commit/f3daa4525b1816e475fbfe7add6f3c4a33b13944
Author: Mohamed Akram <mohd.ak...@outlook.com>
Date: Sat Jul 6 17:12:09 2024 +0200
patch 9.1.0535: newline escape wrong in ex mode
Problem: newline escape wrong in ex mode (Konrad Schwarz)
Solution: partly revert patch 7.3.014, remove backslash in front of a
newline when not in prompt mode in ex line mode
(Mohamed Akram)
This fixes newline escaping to allow passing multiple commands to
":global", multiple lines to shell commands, and ending lines in append
mode with backslashes. This should fix a POSIX/(traditional) VI
incompatiblity.
This reverts a previous incorrect attempt at patch v7.3.014 to fix
append mode which removed half of trailing backslashes which lead to,
eg. the following two commands being parsed as having a different number
of backslashes:
```
!echo foo\\
```
```
!echo foo\ \
```
fixes: #6135
fixes: #7244
closes: #15120
Signed-off-by: Mohamed Akram <mohd.ak...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 59d3db4dd..1dc28bc66 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2341,12 +2341,7 @@ do_one_cmd(
{
for (p = ea.arg; *p; ++p)
{
- // Remove one backslash before a newline, so that it's possible to
- // pass a newline to the shell and also a newline that is preceded
- // with a backslash. This makes it impossible to end a shell
- // command in a backslash, but that doesn't appear useful.
- // Halving the number of backslashes is incompatible with previous
- // versions.
+ // Remove one backslash before a newline
if (*p == '\' && p[1] == '
')
STRMOVE(p, p + 1);
else if (*p == '
' && !(ea.argt & EX_EXPR_ARG))
diff --git a/src/ex_getln.c b/src/ex_getln.c
index f05259bb9..51a38e583 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3138,31 +3138,15 @@ redraw:
windgoto(msg_row, msg_col);
pend = (char_u *)(line_ga.ga_data) + line_ga.ga_len;
- // We are done when a NL is entered, but not when it comes after an
- // odd number of backslashes, that results in a NUL.
- if (line_ga.ga_len > 0 && pend[-1] == '
')
+ // We are done when a NL is entered, but not when it comes after a
+ // backslash in prompt mode.
+ if (line_ga.ga_len > 0 && pend[-1] == '
'
+ && (line_ga.ga_len <= 1 || pend[-2] != '\' || !promptc))
{
- int bcount = 0;
-
- while (line_ga.ga_len - 2 >= bcount && pend[-2 - bcount] == '\')
- ++bcount;
-
- if (bcount > 0)
- {
- // Halve the number of backslashes: "\NL" -> "NUL", "\NL" ->
- // "\NL", etc.
- line_ga.ga_len -= (bcount + 1) / 2;
- pend -= (bcount + 1) / 2;
- pend[-1] = '
';
- }
-
- if ((bcount & 1) == 0)
- {
- --line_ga.ga_len;
- --pend;
- *pend = NUL;
- break;
- }
+ --line_ga.ga_len;
+ --pend;
+ *pend = NUL;
+ break;
}
}
diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim
index 59c28f383..12e983f4b 100644
--- a/src/testdir/test_ex_mode.vim
+++ b/src/testdir/test_ex_mode.vim
@@ -165,6 +165,37 @@ func Test_Ex_global()
call assert_equal('bax', getline(3))
call assert_equal('bay', getline(5))
bwipe!
+
+ new
+ call setline(1, ['foo', 'bar'])
+ call feedkeys("Qg/./i\
a\
.\
a\
b\
.", "xt")
+ call assert_equal(['a', 'b', 'foo', 'a', 'b', 'bar'], getline(1, '$'))
+ bwipe!
+endfunc
+
+func Test_Ex_shell()
+ CheckUnix
+
+ new
+ call feedkeys("Qr !echo foo\
echo bar
", 'xt')
+ call assert_equal(['', 'foo', 'bar'], getline(1, '$'))
+ bwipe!
+
+ new
+ call feedkeys("Qr !echo foo\\
bar
", 'xt')
+ call assert_equal(['', 'foobar'], getline(1, '$'))
+ bwipe!
+
+ new
+ call feedkeys("Qr !echo foo\ \
echo bar
", 'xt')
+ call assert_equal(['', 'foo ', 'bar'], getline(1, '$'))
+ bwipe!
+
+ new
+ call setline(1, ['bar', 'baz'])
+ call feedkeys("Qg/./!echo \
s/b/c/", "xt")
+ call assert_equal(['car', 'caz'], getline(1, '$'))
+ bwipe!
endfunc
" Test for pressing Ctrl-C in :append inside a loop in Ex mode
@@ -204,18 +235,11 @@ func Test_Ex_append()
call feedkeys("Qappend!
pqr
xyz
.
visual
", 'xt')
call assert_equal([" abc", " pqr", " xyz"], getline(1,
'$'))
close!
-endfunc
-" In Ex-mode, backslashes at the end of a command should be halved.
-func Test_Ex_echo_backslash()
- " This test works only when the language is English
- CheckEnglish
- let bsl = '\\'
- let bsl2 = '\\'
- call assert_fails('call feedkeys("Qecho " .. bsl .. "
visual
", "xt")',
- \ 'E15: Invalid expression: "\"')
- call assert_fails('call feedkeys("Qecho " .. bsl2 .. "
m
visual
", "xt")',
- \ "E15: Invalid expression: \"\
m\"")
+ new
+ call feedkeys("Qappend
a\
.", 'xt')
+ call assert_equal(['a\'], getline(1, '$'))
+ close!
endfunc
func Test_ex_mode_errors()
@@ -314,5 +338,12 @@ func Test_empty_command_visual_mode()
call delete('guidialogfile')
endfunc
+" Test using backslash in ex-mode
+func Test_backslash_multiline()
+ new
+ call setline(1, 'enum')
+ call feedkeys('Qg/enum/i\
\
.', "xt")
+ call assert_equal(["", "enum"], getline(1, 2))
+endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 237135558..ffbc13eec 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 */
+/**/
+ 535,
/**/
534,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1sQ7MR-006kB8-3g%40256bit.org.
