aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorprollings <patrickrollings@gmail.com>2016-07-03 10:22:59 +1000
committerJustin M. Keyes <justinkz@gmail.com>2016-07-02 20:22:59 -0400
commitf80eb768c75de2065626203de001738e1dda436e (patch)
tree1c0933ce1873ee21fe1741775ea71fb581355191 /src
parentc6eff87a25020032d089a0e40ae1a809d1b72bac (diff)
downloadrneovim-f80eb768c75de2065626203de001738e1dda436e.tar.gz
rneovim-f80eb768c75de2065626203de001738e1dda436e.tar.bz2
rneovim-f80eb768c75de2065626203de001738e1dda436e.zip
vim-patch:7.4.1121 (#4989)
Problem: test_expand leaves files behind. Solution: Edit another file before deleting, otherwise the swap file remains. https://github.com/vim/vim/commit/08b270a8a4544be9a7fecce311834fde2b457634
Diffstat (limited to 'src')
-rw-r--r--src/nvim/version.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index aa3a34b3df..36f2b51ac2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -574,7 +574,7 @@ static int included_patches[] = {
// 1124 NA
1123,
// 1122 NA
- // 1121,
+ 1121,
1120,
1119,
1118,