aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorraichoo <raichoo@googlemail.com>2017-03-22 21:57:20 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-03-22 21:57:20 +0100
commit44e75eba30682007dd17f9a80805a9925a921976 (patch)
tree8c8e9967ce159af621f72b7569953ed5598c6868 /src/nvim/version.c
parentf7aa1bfde6bc3600e4914cf38c777ff7f1ea56ab (diff)
downloadrneovim-44e75eba30682007dd17f9a80805a9925a921976.tar.gz
rneovim-44e75eba30682007dd17f9a80805a9925a921976.tar.bz2
rneovim-44e75eba30682007dd17f9a80805a9925a921976.zip
vim-patch:7.4.2161 (#6340)
Problem: Expression test fails without conceal feature. Solution: Only check "conceal" with the conceal feature. https://github.com/vim/vim/commit/7ab6defcafe017a3ad58580a3e56dab705b1ed8b
Diffstat (limited to 'src/nvim/version.c')
-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 398a3e6542..cbb7902985 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -280,7 +280,7 @@ static int included_patches[] = {
2164,
2163,
2162,
- // 2161,
+ 2161,
2160,
2159,
2158,