updated for version 7.4.141

Problem:    Problems when building with Borland: st_mode is signed short;
            can't build with Python; temp files not ignored by Mercurial;
            building with DEBUG doesn't define _DEBUG.
Solution:   Fix the problems. (Ken Takata)

diff --git a/.gitignore b/.gitignore
index eff38a83ec9aa25bfb1274665bfe35ee004fe916..9fbd77957cc3b02f30d2b3f3f1096452117d1f9a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,15 @@ src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
 
+# Borland C++
+bcc.cfg
+*.ilc
+*.ild
+*.ilf
+*.ils
+*.map
+*.tds
+
 # Mac OSX
 src/xxd/xxd.dSYM
 

diff --git a/src/Make_bc5.mak b/src/Make_bc5.mak
index 8172c1f4cc1ebae9335ab8125aec40c11214cd14..5769bd64ba94c3304f8987851cb1405e1ed6cbe9 100644 (file)
--- a/src/Make_bc5.mak
+++ b/src/Make_bc5.mak
@@ -419,7 +419,7 @@ CPUARG = -$(CPUNR)
 ALIGNARG = -a$(ALIGN)
 #
 !if ("$(DEBUG)"=="yes")
-DEFINES=$(DEFINES) -DDEBUG
+DEFINES=$(DEFINES) -DDEBUG -D_DEBUG
 !endif
 #
 !if ("$(OLE)"=="yes")

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 5a49d1e9e2dc2108677f8e36e467db377c00aa4a..17c02a9ec2e31ea8796fd31f72bd96a2f1ba20ea 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -13,6 +13,11 @@
  * Common code for if_python.c and if_python3.c.
  */
 
+#ifdef __BORLANDC__
+/* Disable Warning W8060: Possibly incorrect assignment in function ... */
+# pragma warn -8060
+#endif
+
 static char_u e_py_systemexit[]        = "E880: Can't handle SystemExit of %s exception in vim";
 
 #if PY_VERSION_HEX < 0x02050000

diff --git a/src/os_win32.c b/src/os_win32.c
index fff3f8476079ba6caa1caf3d879a5584b56fbe77..4feb69791a05a4518d6002ca3306a6215d90612b 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2960,7 +2960,7 @@ mch_getperm(char_u *name)
     int                n;
 
     n = mch_stat(name, &st);
-    return n == 0 ? (long)st.st_mode : -1L;
+    return n == 0 ? (long)(unsigned short)st.st_mode : -1L;
 }
 
 

diff --git a/src/version.c b/src/version.c
index 55b52de6a963c5cd6b42e94b3dabbd0742081a39..1fd98ead21acec0956b09c6d893b5f1c028dafa0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    141,
 /**/
     140,
 /**/