mirror of
https://github.com/vim/vim.git
synced 2025-08-27 20:13:38 -04:00
updated for version 7.0044
This commit is contained in:
parent
1fad5d49c9
commit
aab21c3533
@ -501,9 +501,14 @@ PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib
|
|||||||
MZSCHEME_VER = 205_000
|
MZSCHEME_VER = 205_000
|
||||||
!endif
|
!endif
|
||||||
CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
|
CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
|
||||||
MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
|
!if "$(DYNAMIC_MZSCHEME)" == "yes"
|
||||||
|
!message MzScheme DLLs will be loaded dynamically
|
||||||
|
CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
|
||||||
|
!else
|
||||||
MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
|
MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
|
||||||
!endif
|
!endif
|
||||||
|
MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
|
||||||
|
!endif
|
||||||
|
|
||||||
# Perl interface
|
# Perl interface
|
||||||
!ifdef PERL
|
!ifdef PERL
|
||||||
|
@ -1052,6 +1052,7 @@ set_keep_msg(s)
|
|||||||
keep_msg = vim_strsave(s);
|
keep_msg = vim_strsave(s);
|
||||||
else
|
else
|
||||||
keep_msg = NULL;
|
keep_msg = NULL;
|
||||||
|
keep_msg_more = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -240,11 +240,11 @@ extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path,
|
|||||||
#if defined(FEAT_PERL) && !defined(IN_PERL_FILE)
|
#if defined(FEAT_PERL) && !defined(IN_PERL_FILE)
|
||||||
# define CV void
|
# define CV void
|
||||||
# ifdef __BORLANDC__
|
# ifdef __BORLANDC__
|
||||||
# pragma option -pc
|
#pragma option -pc
|
||||||
# endif
|
# endif
|
||||||
# include "if_perl.pro"
|
# include "if_perl.pro"
|
||||||
# ifdef __BORLANDC__
|
# ifdef __BORLANDC__
|
||||||
# pragma option -p.
|
#pragma option -p.
|
||||||
# endif
|
# endif
|
||||||
# include "if_perlsfio.pro"
|
# include "if_perlsfio.pro"
|
||||||
#endif
|
#endif
|
||||||
|
18
src/vim.h
18
src/vim.h
@ -20,9 +20,9 @@
|
|||||||
defined(DYNAMIC_ICONV) || \
|
defined(DYNAMIC_ICONV) || \
|
||||||
defined(DYNAMIC_IME) || \
|
defined(DYNAMIC_IME) || \
|
||||||
defined(XPM)
|
defined(XPM)
|
||||||
# pragma option -pc
|
#pragma option -pc
|
||||||
# else
|
# else
|
||||||
# pragma option -pr
|
#pragma option -pr
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -1284,7 +1284,6 @@ enum hlf_value
|
|||||||
#else
|
#else
|
||||||
# define MB_STRICMP(d, s) STRICMP((d), (s))
|
# define MB_STRICMP(d, s) STRICMP((d), (s))
|
||||||
# define MB_STRNICMP(d, s, n) STRNICMP((d), (s), (n))
|
# define MB_STRNICMP(d, s, n) STRNICMP((d), (s), (n))
|
||||||
# define transchar_byte(c) transchar(c)
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define STRCAT(d, s) strcat((char *)(d), (char *)(s))
|
#define STRCAT(d, s) strcat((char *)(d), (char *)(s))
|
||||||
@ -1632,6 +1631,17 @@ typedef int VimClipboard; /* This is required for the prototypes. */
|
|||||||
# define USE_MCH_ERRMSG
|
# define USE_MCH_ERRMSG
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef FEAT_MBYTE
|
||||||
|
# define after_pathsep(b, p) vim_ispathsep(*((p) - 1))
|
||||||
|
# define transchar_byte(c) transchar(c)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef FEAT_LINEBREAK
|
||||||
|
/* Without the 'numberwidth' option line numbers are always 7 chars. */
|
||||||
|
# define number_width(x) 7
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include "globals.h" /* global variables and messages */
|
#include "globals.h" /* global variables and messages */
|
||||||
|
|
||||||
#ifdef FEAT_SNIFF
|
#ifdef FEAT_SNIFF
|
||||||
@ -1678,7 +1688,7 @@ typedef int VimClipboard; /* This is required for the prototypes. */
|
|||||||
|
|
||||||
/* stop using fastcall for Borland */
|
/* stop using fastcall for Borland */
|
||||||
#if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
|
#if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
|
||||||
# pragma option -p.
|
#pragma option -p.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MEM_PROFILE)
|
#if defined(MEM_PROFILE)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user