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 eff38a8..9fbd779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,15 @@
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 8172c1f..5769bd6 100644
--- a/src/Make_bc5.mak
+++ b/src/Make_bc5.mak
@@ -419,7 +419,7 @@
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 5a49d1e..17c02a9 100644
--- 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 fff3f84..4feb697 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2960,7 +2960,7 @@
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 55b52de..1fd98ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 141,
+/**/
140,
/**/
139,
