diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-07-24 11:51:40 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-07-24 11:51:40 +0000 |
| commit | 688e5f7ee7e9384494e9c16ae48c512980c54e4f (patch) | |
| tree | 9e4b2e3575a6720be516cf3fba53298685838170 /src | |
| parent | 4394bfff3fcd4eaced1f19ed088719de4632e0d9 (diff) | |
| download | vim-git-688e5f7ee7e9384494e9c16ae48c512980c54e4f.tar.gz | |
updated for version 7.2b-012v7.2b.012
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 587081bda..7718e97c8 100644 --- a/src/main.c +++ b/src/main.c @@ -2245,7 +2245,12 @@ scripterror: /* Remember this argument has been added to the argument list. * Needed when 'encoding' is changed. */ used_file_arg(argv[0], parmp->literal, parmp->full_path, - parmp->diff_mode); +# ifdef FEAT_DIFF + parmp->diff_mode +# else + FALSE +# endif + ); } #endif } diff --git a/src/version.c b/src/version.c index cd69cfc02..f46ebda2c 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 12, +/**/ 11, /**/ 10, |