From: Eric Pouech epouech@codeweavers.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58614
Signed-off-by: Eric Pouech epouech@codeweavers.com --- programs/cmd/tests/test_builtins.cmd | 1 - programs/cmd/tests/test_builtins.cmd.exp | 1 - programs/cmd/wcmdmain.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1cc70caabed..9f144bb4e0a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -136,7 +136,6 @@ echo rem itsme >> callme.cmd echo :itsmeagain >> callme.cmd echo @echo off >> callme.cmd call callme.cmd -@echo ---
rem cleanup del foo.txt diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d70d751669e..6ec30eba3a7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -152,7 +152,6 @@ ECHO_IS_ON ECHO_IS_OFF
@pwd@>rem itsme@space@@space@ -@todo_wine@--- ------------ Testing parameterization ------------ 'a', 'b', 'c' '"a b c"', '', '' diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8f0d0d636b7..26c2be2e1c3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -3197,7 +3197,7 @@ static WCHAR *fetch_next_line(BOOL first_line, WCHAR* buffer)
buffer = WCMD_skip_leading_spaces(buffer); /* Show prompt before batch line IF echo is on and in batch program */ - if (WCMD_is_in_context(NULL) && echo_mode && *buffer && *buffer != '@') + if (WCMD_is_in_context(NULL) && echo_mode && *buffer && *buffer != L'@' && *buffer != L':') { if (first_line) {