To: vim_dev@googlegroups.com
Subject: Patch 8.2.0995
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.0995
Problem:    Insufficient testing for the readdir() sort option.
Solution:   Add a few more tests. (Christian Brabandt, closes #6278)
Files:      src/testdir/test_functions.vim


*** ../vim-8.2.0994/src/testdir/test_functions.vim	2020-06-16 22:27:35.827988257 +0200
--- src/testdir/test_functions.vim	2020-06-17 20:28:57.786445063 +0200
***************
*** 2014,2019 ****
--- 2014,2038 ----
    let files = readdir(dir, '1', #{sort: 'icase'})
    call assert_equal(default->sort('i'), files, 'sort by ignoring case')
  
+   " 4) collation
+   let collate = v:collate
+   lang collate C
+   let files = readdir(dir, 1, #{sort: 'collate'})
+   call assert_equal(default->sort(), files, 'sort by C collation')
+   exe "lang collate" collate
+ 
+   " 5) Errors
+   call assert_fails('call readdir(dir, 1, 1)', 'E715')
+   call assert_fails('call readdir(dir, 1, #{sorta: 1})')
+   call assert_fails('call readdirex(dir, 1, #{sorta: 1})')
+ 
+   " 6) ignore other values in dict
+   let files = readdir(dir, '1', #{sort: 'c'})
+   call assert_equal(default, files, 'sort using default2')
+ 
+   " Cleanup
+   exe "lang collate" collate
+ 
    eval dir->delete('rf')
  endfunc
  
*** ../vim-8.2.0994/src/version.c	2020-06-17 20:03:33.150287410 +0200
--- src/version.c	2020-06-17 20:30:16.994233211 +0200
***************
*** 756,757 ****
--- 756,759 ----
  {   /* Add new patch number below this line */
+ /**/
+     995,
  /**/

-- 
The early bird gets the worm. The second mouse gets the cheese.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///