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 cc3f512..a805a0c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -8331,7 +8331,9 @@
>= 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 adde9d7..a4db3c8 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -967,7 +967,7 @@
}
}
- 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 @@
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 7c5b3c037..24ed70e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 841,
+/**/
840,
/**/
839,