updated for version 7.0-028

diff --git a/src/os_os2_cfg.h b/src/os_os2_cfg.h
index ce3b4bbde820524634f82913142c9a34e5a7c92a..62527a9f6b10498c736e8cb6593a12e1f1d0114f 100644 (file)
--- a/src/os_os2_cfg.h
+++ b/src/os_os2_cfg.h
@@ -183,6 +183,9 @@
 /* Define if you have the ANSI C header files. */
 /* #undef STDC_HEADERS */
 
+/* added by David Sanders */
+#define HAVE_STDARG_H 1
+
 /* instead, we check a few STDC things ourselves */
 #define HAVE_STDLIB_H  1
 #undef HAVE_STRING_H   /* On EMX it is better to use strings.h */

diff --git a/src/os_unix.c b/src/os_unix.c
index b3754689d7a5ce14ee89fadb6f69a5f08b18132a..86f52c54e531e7eddf1203b917bda2e6d4911317 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4971,7 +4971,8 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
                    if (((*file)[*num_file] = alloc(len + 2)) != NULL)
                    {
                        STRCPY((*file)[*num_file], p);
-                       if (!after_pathsep((*file)[*num_file] + len))
+                       if (!after_pathsep((*file)[*num_file],
+                                                   (*file)[*num_file] + len))
                        {
                            (*file)[*num_file][len] = psepc;
                            (*file)[*num_file][len + 1] = NUL;

diff --git a/src/version.c b/src/version.c
index be2baf468751e9fc6f95ed58fa6b7706bc6de2ba..0b0703c565f30f423e00836a05a7f43d9764a4f8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    28,
 /**/
     27,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 3ee12bf691f16580fde8f2e5b25de74be51855b4..a72e655562cae512d04a855e89776e1d410bb9fc 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1983,7 +1983,7 @@ typedef int proftime_T;       /* dummy for function prototypes */
 /* values for vim_handle_signal() that are not a signal */
 #define SIGNAL_BLOCK   -1
 #define SIGNAL_UNBLOCK  -2
-#if !defined(UNIX) && !defined(VMS)
+#if !defined(UNIX) && !defined(VMS) && !defined(OS2)
 # define vim_handle_signal(x) 0
 #endif