|
 |
8b9a1c |
To: vim_dev@googlegroups.com
|
|
|
8b9a1c |
Subject: Patch 7.4.141
|
|
|
8b9a1c |
Fcc: outbox
|
|
|
8b9a1c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
8b9a1c |
Mime-Version: 1.0
|
|
|
8b9a1c |
Content-Type: text/plain; charset=UTF-8
|
|
|
8b9a1c |
Content-Transfer-Encoding: 8bit
|
|
|
8b9a1c |
------------
|
|
|
8b9a1c |
|
|
|
8b9a1c |
Patch 7.4.141
|
|
|
8b9a1c |
Problem: Problems when building with Borland: st_mode is signed short;
|
|
|
8b9a1c |
can't build with Python; temp files not ignored by Mercurial;
|
|
|
8b9a1c |
building with DEBUG doesn't define _DEBUG.
|
|
|
8b9a1c |
Solution: Fix the problems. (Ken Takata)
|
|
|
8b9a1c |
Files: src/Make_bc5.mak, src/if_py_both.h, src/os_win32.c
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.140/src/Make_bc5.mak 2013-06-03 20:09:58.000000000 +0200
|
|
|
8b9a1c |
--- src/Make_bc5.mak 2014-01-10 18:12:14.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 419,425 ****
|
|
|
8b9a1c |
ALIGNARG = -a$(ALIGN)
|
|
|
8b9a1c |
#
|
|
|
8b9a1c |
!if ("$(DEBUG)"=="yes")
|
|
|
8b9a1c |
! DEFINES=$(DEFINES) -DDEBUG
|
|
|
8b9a1c |
!endif
|
|
|
8b9a1c |
#
|
|
|
8b9a1c |
!if ("$(OLE)"=="yes")
|
|
|
8b9a1c |
--- 419,425 ----
|
|
|
8b9a1c |
ALIGNARG = -a$(ALIGN)
|
|
|
8b9a1c |
#
|
|
|
8b9a1c |
!if ("$(DEBUG)"=="yes")
|
|
|
8b9a1c |
! DEFINES=$(DEFINES) -DDEBUG -D_DEBUG
|
|
|
8b9a1c |
!endif
|
|
|
8b9a1c |
#
|
|
|
8b9a1c |
!if ("$(OLE)"=="yes")
|
|
|
8b9a1c |
*** ../vim-7.4.140/src/if_py_both.h 2013-12-07 14:28:37.000000000 +0100
|
|
|
8b9a1c |
--- src/if_py_both.h 2014-01-10 18:12:14.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 13,18 ****
|
|
|
8b9a1c |
--- 13,23 ----
|
|
|
8b9a1c |
* Common code for if_python.c and if_python3.c.
|
|
|
8b9a1c |
*/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
+ #ifdef __BORLANDC__
|
|
|
8b9a1c |
+ /* Disable Warning W8060: Possibly incorrect assignment in function ... */
|
|
|
8b9a1c |
+ # pragma warn -8060
|
|
|
8b9a1c |
+ #endif
|
|
|
8b9a1c |
+
|
|
|
8b9a1c |
static char_u e_py_systemexit[] = "E880: Can't handle SystemExit of %s exception in vim";
|
|
|
8b9a1c |
|
|
|
8b9a1c |
#if PY_VERSION_HEX < 0x02050000
|
|
|
8b9a1c |
*** ../vim-7.4.140/src/os_win32.c 2014-01-10 13:51:35.000000000 +0100
|
|
|
8b9a1c |
--- src/os_win32.c 2014-01-10 18:12:14.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 2960,2966 ****
|
|
|
8b9a1c |
int n;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
n = mch_stat(name, &st);
|
|
|
8b9a1c |
! return n == 0 ? (long)st.st_mode : -1L;
|
|
|
8b9a1c |
}
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--- 2960,2966 ----
|
|
|
8b9a1c |
int n;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
n = mch_stat(name, &st);
|
|
|
8b9a1c |
! return n == 0 ? (long)(unsigned short)st.st_mode : -1L;
|
|
|
8b9a1c |
}
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.140/src/version.c 2014-01-10 16:43:09.000000000 +0100
|
|
|
8b9a1c |
--- src/version.c 2014-01-10 18:14:58.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 740,741 ****
|
|
|
8b9a1c |
--- 740,743 ----
|
|
|
8b9a1c |
{ /* Add new patch number below this line */
|
|
|
8b9a1c |
+ /**/
|
|
|
8b9a1c |
+ 141,
|
|
|
8b9a1c |
/**/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--
|
|
|
8b9a1c |
Never eat yellow snow.
|
|
|
8b9a1c |
|
|
|
8b9a1c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
8b9a1c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
8b9a1c |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
8b9a1c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|