Mirror of the Vim source from https://github.com/vim/vim
Revision | 0a908b65de1dbebbde1aacfd50aa41ef09e6865e (tree) |
---|---|
Time | 2008-07-24 20:51:40 |
Author | vimboss |
Commiter | vimboss |
updated for version 7.2b-012
@@ -2245,7 +2245,12 @@ | ||
2245 | 2245 | /* Remember this argument has been added to the argument list. |
2246 | 2246 | * Needed when 'encoding' is changed. */ |
2247 | 2247 | used_file_arg(argv[0], parmp->literal, parmp->full_path, |
2248 | - parmp->diff_mode); | |
2248 | +# ifdef FEAT_DIFF | |
2249 | + parmp->diff_mode | |
2250 | +# else | |
2251 | + FALSE | |
2252 | +# endif | |
2253 | + ); | |
2249 | 2254 | } |
2250 | 2255 | #endif |
2251 | 2256 | } |
@@ -677,6 +677,8 @@ | ||
677 | 677 | static int included_patches[] = |
678 | 678 | { /* Add new patch number below this line */ |
679 | 679 | /**/ |
680 | + 12, | |
681 | +/**/ | |
680 | 682 | 11, |
681 | 683 | /**/ |
682 | 684 | 10, |