updated for version 7.1-135

diff --git a/src/buffer.c b/src/buffer.c
index 9f4c3deb4919a8b039fc237a372e2689f2fb0ad3..5aa69c588635d9d4164c5d2eeacb18f8d145a745 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4175,29 +4175,35 @@ fix_fname(fname)
      * mess up the full path name, even though it starts with a '/'.
      * Also expand when there is ".." in the file name, try to remove it,
      * because "c:/src/../README" is equal to "c:/README".
+     * Similarly "c:/src//file" is equal to "c:/src/file".
      * For MS-Windows also expand names like "longna~1" to "longname".
      */
 #ifdef UNIX
     return FullName_save(fname, TRUE);
 #else
-    if (!vim_isAbsName(fname) || strstr((char *)fname, "..") != NULL
-#if defined(MSWIN) || defined(DJGPP)
+    if (!vim_isAbsName(fname)
+           || strstr((char *)fname, "..") != NULL
+           || strstr((char *)fname, "//") != NULL
+# ifdef BACKSLASH_IN_FILENAME
+           || strstr((char *)fname, "\\\\") != NULL
+# endif
+# if defined(MSWIN) || defined(DJGPP)
            || vim_strchr(fname, '~') != NULL
-#endif
+# endif
            )
        return FullName_save(fname, FALSE);
 
     fname = vim_strsave(fname);
 
-#ifdef USE_FNAME_CASE
-# ifdef USE_LONG_FNAME
+# ifdef USE_FNAME_CASE
+#  ifdef USE_LONG_FNAME
     if (USE_LONG_FNAME)
-# endif
+#  endif
     {
        if (fname != NULL)
            fname_case(fname, 0);       /* set correct case for file name */
     }
-#endif
+# endif
 
     return fname;
 #endif

diff --git a/src/version.c b/src/version.c
index ba9cc784510b98f5520933f2f47f634bcbb14628..739d9d00bf54ce211f2c13c9d1cf59ffc43b2dfd 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 */
+/**/
+    135,
 /**/
     134,
 /**/