From 647a530b33d9d767f591159c24c62de48e57dad7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 3 May 2020 17:01:24 +0200 Subject: patch 8.2.0688: output clobbered if setting 'verbose' to see shell commands Problem: Output clobbered if setting 'verbose' to see shell commands. Solution: Only output "Searching for" when 'verbose' is 11 or higher. --- runtime/doc/options.txt | 2 ++ src/scriptfile.c | 4 ++-- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index baccd25d2..c29ff5ea4 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -8323,9 +8323,11 @@ A jump table for the options with a short description can be found at |Q_op|. Currently, these messages are given: >= 1 When the viminfo file is read or written. >= 2 When a file is ":source"'ed. + >= 4 Shell commands. >= 5 Every searched tags file and include file. >= 8 Files for which a group of autocommands is executed. >= 9 Every executed autocommand. + >= 11 Finding items in a path >= 12 Every executed function. >= 13 When an exception is thrown, caught, finished, or discarded. >= 14 Anything pending in a ":finally" clause. diff --git a/src/scriptfile.c b/src/scriptfile.c index 0756116b1..155ab14bb 100644 --- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -228,7 +228,7 @@ do_in_path( buf = alloc(MAXPATHL); if (buf != NULL && rtp_copy != NULL) { - if (p_verbose > 1 && name != NULL) + if (p_verbose > 10 && name != NULL) { verbose_enter(); smsg(_("Searching for \"%s\" in \"%s\""), @@ -276,7 +276,7 @@ do_in_path( copy_option_part(&np, tail, (int)(MAXPATHL - (tail - buf)), "\t "); - if (p_verbose > 2) + if (p_verbose > 10) { verbose_enter(); smsg(_("Searching for \"%s\""), buf); diff --git a/src/version.c b/src/version.c index 74fabce67..fcc897a0f 100644 --- 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 */ +/**/ + 688, /**/ 687, /**/ -- cgit v1.2.1