changeset 20575:501b72481d0a v8.2.0841

patch 8.2.0841: 'verbose' value 16 causes duplicate output Commit: https://github.com/vim/vim/commit/823654bc06c847af20967d41db32d592aba416cb Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 29 23:03:09 2020 +0200 patch 8.2.0841: 'verbose' value 16 causes duplicate output Problem: 'verbose' value 16 causes duplicate output. Solution: Combine levels 15 and 16 into one message. (Christian Brabandt, closes #6153)
author Bram Moolenaar <Bram@vim.org>
date Fri, 29 May 2020 23:15:03 +0200
parents 856b79787807
children dbb4a66f4ef4
files runtime/doc/options.txt src/ex_docmd.c src/version.c
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -8331,7 +8331,9 @@ A jump table for the options with a shor
 	>= 12	Every executed function.
 	>= 13	When an exception is thrown, caught, finished, or discarded.
 	>= 14	Anything pending in a ":finally" clause.
-	>= 15	Every executed Ex command (truncated at 200 characters).
+	>= 15	Every executed Ex command from a script (truncated at 200
+		characters).
+	>= 16	Every executed Ex command
 
 	This option can also be set with the "-V" argument.  See |-V|.
 	This option is also set by the |:verbose| command.
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -967,7 +967,7 @@ do_cmdline(
 	    }
 	}
 
-	if (p_verbose >= 15 && SOURCING_NAME != NULL)
+	if ((p_verbose >= 15 && SOURCING_NAME != NULL) || p_verbose >= 16)
 	    msg_verbose_cmd(SOURCING_LNUM, cmdline_copy);
 
 	/*
@@ -1691,9 +1691,6 @@ do_one_cmd(
     if ((*cmdlinep)[0] == '#' && (*cmdlinep)[1] == '!')
 	goto doend;
 
-    if (p_verbose >= 16)
-	msg_verbose_cmd(0, *cmdlinep);
-
 /*
  * 1. Skip comment lines and leading white space and colons.
  * 2. Handle command modifiers.
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    841,
+/**/
     840,
 /**/
     839,