]> granicus.if.org Git - vim/commitdiff
updated for version 7.2b-012 v7.2b.012
authorBram Moolenaar <Bram@vim.org>
Thu, 24 Jul 2008 11:51:40 +0000 (11:51 +0000)
committerBram Moolenaar <Bram@vim.org>
Thu, 24 Jul 2008 11:51:40 +0000 (11:51 +0000)
src/main.c
src/version.c

index 587081bda1ad77d3cf3792df6b9ec1f585ed22f0..7718e97c8f4a7f0813ca7750335febfb8f395446 100644 (file)
@@ -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
        }
index cd69cfc0229d5687957f81a69ff446cc3d2dfa03..f46ebda2c56762368a5f06309baed0dc26a5bf0c 100644 (file)
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    12,
 /**/
     11,
 /**/