patch 7.4.1821

Problem:    Test fails on MS-Windows.
Solution:   Sort the completion results.

diff --git a/src/testdir/test_help_tagjump.vim b/src/testdir/test_help_tagjump.vim
index c3249d8fe9de90e4d9684171ead251ee0ae1c91c..62076c39e8e11f38e2b63870459050a59b20a2ff 100644 (file)
--- a/src/testdir/test_help_tagjump.vim
+++ b/src/testdir/test_help_tagjump.vim
@@ -102,36 +102,36 @@ func Test_help_complete()
       set rtp+=Xdir1/doc-ab
       set helplang=
       let list = s:get_cmd_compl_list(":h test")
-      call assert_equal(['h test-col@en', 'h test-col@ab',
-            \             'h test-char@en', 'h test-char@ab'], list)
+      call assert_equal(sort(['h test-col@en', 'h test-col@ab',
+            \             'h test-char@en', 'h test-char@ab']), sort(list))
 
       " 'helplang=ab' and help file lang is 'en' and 'ab'
       set helplang=ab
       let list = s:get_cmd_compl_list(":h test")
-      call assert_equal(['h test-col', 'h test-col@en',
-            \             'h test-char', 'h test-char@en'], list)
+      call assert_equal(sort(['h test-col', 'h test-col@en',
+            \             'h test-char', 'h test-char@en']), sort(list))
 
       " 'helplang=' and help file lang is 'en', 'ab' and 'ja'
       set rtp+=Xdir1/doc-ja
       set helplang=
       let list = s:get_cmd_compl_list(":h test")
-      call assert_equal(['h test-col@en', 'h test-col@ab',
+      call assert_equal(sort(['h test-col@en', 'h test-col@ab',
             \             'h test-col@ja', 'h test-char@en',
-            \             'h test-char@ab', 'h test-char@ja'], list)
+            \             'h test-char@ab', 'h test-char@ja']), sort(list))
 
       " 'helplang=ab' and help file lang is 'en', 'ab' and 'ja'
       set helplang=ab
       let list = s:get_cmd_compl_list(":h test")
-      call assert_equal(['h test-col', 'h test-col@en',
+      call assert_equal(sort(['h test-col', 'h test-col@en',
             \             'h test-col@ja', 'h test-char',
-            \             'h test-char@en', 'h test-char@ja'], list)
+            \             'h test-char@en', 'h test-char@ja']), sort(list))
 
       " 'helplang=ab,ja' and help file lang is 'en', 'ab' and 'ja'
       set helplang=ab,ja
       let list = s:get_cmd_compl_list(":h test")
-      call assert_equal(['h test-col', 'h test-col@ja',
+      call assert_equal(sort(['h test-col', 'h test-col@ja',
             \             'h test-col@en', 'h test-char',
-            \             'h test-char@ja', 'h test-char@en'], list)
+            \             'h test-char@ja', 'h test-char@en']), sort(list))
     endif
   catch
     call assert_exception('X')

diff --git a/src/version.c b/src/version.c
index 4dafb844292d71e70048331d6202e169cd28a7cd..56e9a3e61a8640a44527e6aad6cfed399b40730c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1821,
 /**/
     1820,
 /**/