# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1625932804 -7200
# Node ID da0e5ff44b141431dcccd4a96f7629ac4ab19003
# Parent  653d6c3edabe9403738a6c8204c74a564a5e5f3a
patch 8.2.3136: no test for E187 and "No swap file"

Commit: https://github.com/vim/vim/commit/fe3418abe0dac65e42e85b5a91c5d0c975bc65bb
Author: Dominique Pelle <dominique.pelle@gmail.com>
Date:   Sat Jul 10 17:59:48 2021 +0200

    patch 8.2.3136: no test for E187 and "No swap file"

    Problem:    No test for E187 and "No swap file".
    Solution:   Add a test. (Dominique Pell?, closes https://github.com/vim/vim/issues/8540)

diff --git a/src/testdir/test_cd.vim b/src/testdir/test_cd.vim
--- a/src/testdir/test_cd.vim
+++ b/src/testdir/test_cd.vim
@@ -1,6 +1,7 @@
 " Test for :cd and chdir()
 
 source shared.vim
+source check.vim
 
 func Test_cd_large_path()
   " This used to crash with a heap write overflow.
@@ -177,6 +178,21 @@ func Test_lcd_split()
   quit!
 endfunc
 
+func Test_cd_from_non_existing_dir()
+  CheckNotMSWindows
+
+  let saveddir = getcwd()
+  call mkdir('Xdeleted_dir')
+  cd Xdeleted_dir
+  call delete(saveddir .. '/Xdeleted_dir', 'd')
+
+  " Expect E187 as the current directory was deleted.
+  call assert_fails('pwd', 'E187:')
+  call assert_equal('', getcwd())
+  cd -
+  call assert_equal(saveddir, getcwd())
+endfunc
+
 func Test_cd_completion()
   call mkdir('XComplDir1', 'p')
   call mkdir('XComplDir2', 'p')
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -574,4 +574,8 @@ func Test_swapchoice()
   augroup! test_swapchoice
 endfunc
 
+func Test_no_swap_file()
+  call assert_equal("\nNo swap file", execute('swapname'))
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3136,
+/**/
     3135,
 /**/
     3134,