# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1462653005 -7200
# Node ID f60bdac6cc2cb697323d3f6f3390e8eb085c6d34
# Parent  55d9f1810486f66be575857500264eda1616bdda
commit https://github.com/vim/vim/commit/4ed6b2e2d7fd5959fb9b9f608935d47305c4bbe4
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat May 7 22:28:53 2016 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1821,
+/**/
     1820,
 /**/
     1819,