From c8cb883015619cfe6db931ac2d6e15b0be5c56ed Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 18 Jun 2020 21:14:30 +0200
Subject: patch 8.2.1007: completion doesn't work after ":r ++arg !"

Problem:    Completion doesn't work after ":r ++arg !".
Solution:   Skip over "++arg". (Christian Brabandt, closes #6275,
            closes #6258)
---
 src/cmdexpand.c              |  9 +++++++++
 src/testdir/test_cmdline.vim | 15 +++++++++++++++
 src/version.c                |  2 ++
 3 files changed, 26 insertions(+)

diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index 9508d669d..63f0cc7b1 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -1146,6 +1146,15 @@ set_one_cmd_context(
 	arg = skipwhite(arg);
     }
 
+    // Skip over ++argopt argument
+    if ((ea.argt & EX_ARGOPT) && *arg != NUL && STRNCMP(arg, "++", 2) == 0)
+    {
+	p = arg;
+	while (*p && !vim_isspace(*p))
+	    MB_PTR_ADV(p);
+	arg = skipwhite(p);
+    }
+
     // Check for '|' to separate commands and '"' to start comments.
     // Don't do this for ":read !cmd" and ":write !cmd".
     if ((ea.argt & EX_TRLBAR) && !usefilter)
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index eeb9c2f54..5d772eacd 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -1568,5 +1568,20 @@ func Test_zero_line_search()
   q!
 endfunc
 
+func Test_read_shellcmd()
+  CheckUnix
+  if executable('ls')
+    " There should be ls in the $PATH
+    call feedkeys(":r! l\<c-a>\<c-b>\"\<cr>", 'tx')
+    call assert_match('^"r! .*\<ls\>', @:)
+  endif
+
+  if executable('rm')
+    call feedkeys(":r! ++enc=utf-8 r\<c-a>\<c-b>\"\<cr>", 'tx')
+    call assert_notmatch('^"r!.*\<runtest.vim\>', @:)
+    call assert_match('^"r!.*\<rm\>', @:)
+  endif
+endfunc
+
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 080a8b159..6ea02b95a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1007,
 /**/
     1006,
 /**/
-- 
cgit v1.2.1