To: vim_dev@googlegroups.com
Subject: Patch 8.2.5093
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.5093
Problem:    Error message for unknown command may mention the command twice.
            (Malcolm Rowe)
Solution:   Add the did_append_cmd flag. (closes #10570)
Files:      src/ex_docmd.c


*** ../vim-8.2.5092/src/ex_docmd.c	2022-06-14 15:43:14.876748322 +0100
--- src/ex_docmd.c	2022-06-14 16:03:23.809383884 +0100
***************
*** 1744,1749 ****
--- 1744,1750 ----
      int		did_set_expr_line = FALSE;
  #endif
      int		sourcing = flags & DOCMD_VERBOSE;
+     int		did_append_cmd = FALSE;
  
      CLEAR_FIELD(ea);
      ea.line1 = 1;
***************
*** 2019,2024 ****
--- 2020,2026 ----
  		    append_command(after_modifier);
  		else
  		    append_command(*cmdlinep);
+ 		did_append_cmd = TRUE;
  	    }
  	    errormsg = (char *)IObuff;
  	    did_emsg_syntax = TRUE;
***************
*** 2609,2615 ****
  
      if (errormsg != NULL && *errormsg != NUL && !did_emsg)
      {
! 	if (sourcing || !KeyTyped)
  	{
  	    if (errormsg != (char *)IObuff)
  	    {
--- 2611,2617 ----
  
      if (errormsg != NULL && *errormsg != NUL && !did_emsg)
      {
! 	if ((sourcing || !KeyTyped) && !did_append_cmd)
  	{
  	    if (errormsg != (char *)IObuff)
  	    {
*** ../vim-8.2.5092/src/version.c	2022-06-14 15:43:14.880748311 +0100
--- src/version.c	2022-06-14 16:04:43.529436790 +0100
***************
*** 736,737 ****
--- 736,739 ----
  {   /* Add new patch number below this line */
+ /**/
+     5093,
  /**/

-- 
My Go, this amn keyboar oesn't have a .

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///