aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-02 01:22:30 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-03 01:06:24 -0400
commit86ab4a1cb4cbf377d2ddf90f785d811a0be50cfc (patch)
tree8a3b978d3daa8cc32bf626daaad54f2d35ae30ec /src
parent970d6ee0d1fafb92eeaa56a3d767e704c6ef42c2 (diff)
downloadrneovim-86ab4a1cb4cbf377d2ddf90f785d811a0be50cfc.tar.gz
rneovim-86ab4a1cb4cbf377d2ddf90f785d811a0be50cfc.tar.bz2
rneovim-86ab4a1cb4cbf377d2ddf90f785d811a0be50cfc.zip
vim-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 vim/vim#6153) https://github.com/vim/vim/commit/823654bc06c847af20967d41db32d592aba416cb
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_docmd.c6
-rw-r--r--src/nvim/testdir/test_cmdline.vim1
2 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index a4ed86e4c0..ccaa0b0e52 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -588,7 +588,7 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
}
}
- if (p_verbose >= 15 && sourcing_name != NULL) {
+ if ((p_verbose >= 15 && sourcing_name != NULL) || p_verbose >= 16) {
msg_verbose_cmd(sourcing_lnum, cmdline_copy);
}
@@ -1281,10 +1281,6 @@ static char_u * do_one_cmd(char_u **cmdlinep,
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/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index 27db957149..871143699a 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -722,6 +722,7 @@ func Test_verbosefile()
endfunc
func Test_verbose_option()
+ " See test/functional/ui/cmdline_spec.lua
CheckScreendump
let lines =<< trim [SCRIPT]