diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-07-29 18:13:42 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-07-29 18:13:42 +0200 |
commit | b9a46fec3e79d1fc8c406084a41733c647a5e535 (patch) | |
tree | 01df635eb1f9a9b086b92b88f239933de4f0db08 /src/version.c | |
parent | d05b191b91c4e16d6887bf781832d135d2a8fae5 (diff) | |
download | vim-git-b9a46fec3e79d1fc8c406084a41733c647a5e535.tar.gz |
patch 7.4.2115v7.4.2115
Problem: Loading defaults.vim with -C argument.
Solution: Don't load the defaults script with -C argument. Test sourcing
the defaults script. Set 'display' to "truncate".
Diffstat (limited to 'src/version.c')
-rw-r--r-- | src/version.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c index b036bfd47..37aa255ce 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2115, +/**/ 2114, /**/ 2113, |