From 4ed6b2e2d7fd5959fb9b9f608935d47305c4bbe4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 7 May 2016 22:28:53 +0200
Subject: [PATCH] patch 7.4.1821 Problem:    Test fails on MS-Windows.
 Solution:   Sort the completion results.

---
 src/testdir/test_help_tagjump.vim | 20 ++++++++++----------
 src/version.c                     |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/testdir/test_help_tagjump.vim b/src/testdir/test_help_tagjump.vim
index c3249d8fe9..62076c39e8 100644
--- 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 4dafb84429..56e9a3e61a 100644
--- 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,
 /**/