diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-11 14:28:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-11 14:28:11 +0200 |
| commit | aab9fada4a9b9725ff42dffe9c7daff20f0fd85f (patch) | |
| tree | d2c3d88b28befcefbfd4c44f3d49395dd99c41c3 | |
| parent | ef16c90423ae579927e6294c1ccfd17c5a1c113c (diff) | |
| download | vim-git-aab9fada4a9b9725ff42dffe9c7daff20f0fd85f.tar.gz | |
patch 8.2.1832: readdirex() error is displayed as a messagev8.2.1832
Problem: readdirex() error is displayed as a message. (Yegappan Lakshmanan)
Solution: Use semsg() instead of smsg().
| -rw-r--r-- | src/fileio.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_functions.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c index 83924b352..3d6ff0da3 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4743,7 +4743,7 @@ readdir_core( if (!ok) { failed = TRUE; - smsg(_(e_notopen), path); + semsg(_(e_notopen), path); } else { @@ -4813,7 +4813,7 @@ readdir_core( if (dirp == NULL) { failed = TRUE; - smsg(_(e_notopen), path); + semsg(_(e_notopen), path); } else { diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index b81612548..e8c372cd2 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1959,6 +1959,8 @@ func Test_readdirex() \ ['bar.txt_file', 'dir_dir', 'foo.txt_file', 'link_link']) endif eval 'Xdir'->delete('rf') + + call assert_fails('call readdirex("doesnotexist")', 'E484:') endfunc func Test_readdirex_sort() diff --git a/src/version.c b/src/version.c index b3cbf811b..6368b5e5b 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1832, +/**/ 1831, /**/ 1830, |