From ffe010fa0363d1a04b15cc6af119a4af63ba9363 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 4 Nov 2017 22:30:40 +0100
Subject: [PATCH] patch 8.0.1266: Test_swap_directory was commented out

Problem:    Test_swap_directory was accidentally commented out.
Solution:   Uncomment the test.
---
 src/testdir/test_swap.vim | 92 +++++++++++++++++++--------------------
 src/version.c             |  2 +
 2 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index 457edf685..ee11a731b 100644
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -1,51 +1,51 @@
 " Tests for the swap feature
 
-"" Tests for 'directory' option.
-"func Test_swap_directory()
-"  if !has("unix")
-"    return
-"  endif
-"  let content = ['start of testfile',
-"	      \ 'line 2 Abcdefghij',
-"	      \ 'line 3 Abcdefghij',
-"	      \ 'end of testfile']
-"  call writefile(content, 'Xtest1')
-"
-"  "  '.', swap file in the same directory as file
-"  set dir=.,~
-"
-"  " Verify that the swap file doesn't exist in the current directory
-"  call assert_equal([], glob(".Xtest1*.swp", 1, 1, 1))
-"  edit Xtest1
-"  let swfname = split(execute("swapname"))[0]
-"  call assert_equal([swfname], glob(swfname, 1, 1, 1))
-"
-"  " './dir', swap file in a directory relative to the file
-"  set dir=./Xtest2,.,~
-"
-"  call mkdir("Xtest2")
-"  edit Xtest1
-"  call assert_equal([], glob(swfname, 1, 1, 1))
-"  let swfname = "Xtest2/Xtest1.swp"
-"  call assert_equal(swfname, split(execute("swapname"))[0])
-"  call assert_equal([swfname], glob("Xtest2/*", 1, 1, 1))
-"
-"  " 'dir', swap file in directory relative to the current dir
-"  set dir=Xtest.je,~
-"
-"  call mkdir("Xtest.je")
-"  call writefile(content, 'Xtest2/Xtest3')
-"  edit Xtest2/Xtest3
-"  call assert_equal(["Xtest2/Xtest3"], glob("Xtest2/*", 1, 1, 1))
-"  let swfname = "Xtest.je/Xtest3.swp"
-"  call assert_equal(swfname, split(execute("swapname"))[0])
-"  call assert_equal([swfname], glob("Xtest.je/*", 1, 1, 1))
-"
-"  set dir&
-"  call delete("Xtest1")
-"  call delete("Xtest2", "rf")
-"  call delete("Xtest.je", "rf")
-"endfunc
+" Tests for 'directory' option.
+func Test_swap_directory()
+  if !has("unix")
+    return
+  endif
+  let content = ['start of testfile',
+	      \ 'line 2 Abcdefghij',
+	      \ 'line 3 Abcdefghij',
+	      \ 'end of testfile']
+  call writefile(content, 'Xtest1')
+
+  "  '.', swap file in the same directory as file
+  set dir=.,~
+
+  " Verify that the swap file doesn't exist in the current directory
+  call assert_equal([], glob(".Xtest1*.swp", 1, 1, 1))
+  edit Xtest1
+  let swfname = split(execute("swapname"))[0]
+  call assert_equal([swfname], glob(swfname, 1, 1, 1))
+
+  " './dir', swap file in a directory relative to the file
+  set dir=./Xtest2,.,~
+
+  call mkdir("Xtest2")
+  edit Xtest1
+  call assert_equal([], glob(swfname, 1, 1, 1))
+  let swfname = "Xtest2/Xtest1.swp"
+  call assert_equal(swfname, split(execute("swapname"))[0])
+  call assert_equal([swfname], glob("Xtest2/*", 1, 1, 1))
+
+  " 'dir', swap file in directory relative to the current dir
+  set dir=Xtest.je,~
+
+  call mkdir("Xtest.je")
+  call writefile(content, 'Xtest2/Xtest3')
+  edit Xtest2/Xtest3
+  call assert_equal(["Xtest2/Xtest3"], glob("Xtest2/*", 1, 1, 1))
+  let swfname = "Xtest.je/Xtest3.swp"
+  call assert_equal(swfname, split(execute("swapname"))[0])
+  call assert_equal([swfname], glob("Xtest.je/*", 1, 1, 1))
+
+  set dir&
+  call delete("Xtest1")
+  call delete("Xtest2", "rf")
+  call delete("Xtest.je", "rf")
+endfunc
 
 func Test_swap_group()
   if !has("unix")
diff --git a/src/version.c b/src/version.c
index 78b58115d..81f5fc385 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1266,
 /**/
     1265,
 /**/
-- 
2.50.1