diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-29 23:03:09 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-29 23:03:09 +0200 |
| commit | 823654bc06c847af20967d41db32d592aba416cb (patch) | |
| tree | 242da0c3774743f5acaa9510d252778a4ba98176 | |
| parent | 6cb0726215519fe94103803e4aa77a355384bcf2 (diff) | |
| download | vim-git-823654bc06c847af20967d41db32d592aba416cb.tar.gz | |
patch 8.2.0841: 'verbose' value 16 causes duplicate outputv8.2.0841
Problem: 'verbose' value 16 causes duplicate output.
Solution: Combine levels 15 and 16 into one message. (Christian Brabandt,
closes #6153)
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | src/ex_docmd.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index cc3f5126b..a805a0c27 100644 --- 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 adde9d75f..a4db3c844 100644 --- 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 7c5b3c037..24ed70ebd 100644 --- 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, |