diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-02-09 14:31:05 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-02-09 14:31:05 +0000 |
commit | 769f5895ebfd10535a0ad978f071da8f20178fc6 (patch) | |
tree | 4feadded4b805637168bee1f074f50e438736c85 | |
parent | 28e8f73ae2d90009fd62cd60f97c2643ba44de68 (diff) | |
download | vim-git-769f5895ebfd10535a0ad978f071da8f20178fc6.tar.gz |
patch 8.2.4336: using :filter for :scriptnames does not workv8.2.4336
Problem: Using :filter for :scriptnames does not work. (Ben Jackson)
Solution: Call message_filtered(). (closes #9720)
-rw-r--r-- | src/scriptfile.c | 11 | ||||
-rw-r--r-- | src/testdir/test_filter_cmd.vim | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/scriptfile.c b/src/scriptfile.c index cee3f5440..3b9fec1cd 100644 --- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -1658,10 +1658,13 @@ ex_scriptnames(exarg_T *eap) i, si->sn_state == SN_STATE_NOT_LOADED ? " A" : "", NameBuff); - msg_putchar('\n'); - msg_outtrans(IObuff); - out_flush(); // output one line at a time - ui_breakcheck(); + if (!message_filtered(IObuff)) + { + msg_putchar('\n'); + msg_outtrans(IObuff); + out_flush(); // output one line at a time + ui_breakcheck(); + } } } } diff --git a/src/testdir/test_filter_cmd.vim b/src/testdir/test_filter_cmd.vim index 1a9ae7b5b..7c84a1384 100644 --- a/src/testdir/test_filter_cmd.vim +++ b/src/testdir/test_filter_cmd.vim @@ -190,4 +190,10 @@ func Test_filter_display() bwipe! endfunc +func Test_filter_scriptnames() + let lines = split(execute('filter /test_filter_cmd/ scriptnames'), "\n") + call assert_equal(1, len(lines)) + call assert_match('filter_cmd', lines[0]) +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index ab53d5120..824f17264 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 */ /**/ + 4336, +/**/ 4335, /**/ 4334, |