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)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index cc3f5126bcbc4c5aacc659d4024d27d3d948479a..a805a0c270840db173139531421c1893ce77c585 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -8331,7 +8331,9 @@ A jump table for the options with a short description can be found at |Q_op|.
        >= 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.

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index adde9d75f2a9540e9fd22b6bc4a8141732ca5428..a4db3c84447b2f4d3ddf5119ebfe55b1a329ea25 100644 (file)
--- 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.

diff --git a/src/version.c b/src/version.c
index 7c5b3c0371a3c285a8f6468a619801b4496b098f..24ed70ebd10a908936c0804c5e014290d7f07529 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    841,
 /**/
     840,
 /**/