Mercurial > vim
changeset 127:616289ecb7c8
updated for version 7.0044
| author | vimboss |
|---|---|
| date | Tue, 25 Jan 2005 21:46:35 +0000 |
| parents | c3075f07a273 |
| children | 8def260d486d |
| files | src/Make_mvc.mak src/message.c src/proto.h src/vim.h |
| diffstat | 4 files changed, 23 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -501,8 +501,13 @@ PYTHON_LIB = $(PYTHON)\libs\python$(PYTH MZSCHEME_VER = 205_000 !endif CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include +!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 +!endif MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj -MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib !endif # Perl interface
--- a/src/message.c +++ b/src/message.c @@ -1052,6 +1052,7 @@ set_keep_msg(s) keep_msg = vim_strsave(s); else keep_msg = NULL; + keep_msg_more = FALSE; } /*
--- a/src/proto.h +++ b/src/proto.h @@ -240,11 +240,11 @@ extern char *vim_SelFile __ARGS((Widget #if defined(FEAT_PERL) && !defined(IN_PERL_FILE) # define CV void # ifdef __BORLANDC__ -# pragma option -pc + #pragma option -pc # endif # include "if_perl.pro" # ifdef __BORLANDC__ -# pragma option -p. + #pragma option -p. # endif # include "if_perlsfio.pro" #endif
--- a/src/vim.h +++ b/src/vim.h @@ -20,9 +20,9 @@ defined(DYNAMIC_ICONV) || \ defined(DYNAMIC_IME) || \ defined(XPM) -# pragma option -pc + #pragma option -pc # else -# pragma option -pr + #pragma option -pr # endif #endif @@ -1284,7 +1284,6 @@ enum hlf_value #else # define MB_STRICMP(d, s) STRICMP((d), (s)) # define MB_STRNICMP(d, s, n) STRNICMP((d), (s), (n)) -# define transchar_byte(c) transchar(c) #endif #define STRCAT(d, s) strcat((char *)(d), (char *)(s)) @@ -1632,6 +1631,17 @@ typedef int VimClipboard; /* This is req # define USE_MCH_ERRMSG #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 */ #ifdef FEAT_SNIFF @@ -1678,7 +1688,7 @@ typedef int VimClipboard; /* This is req /* stop using fastcall for Borland */ #if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG) -# pragma option -p. + #pragma option -p. #endif #if defined(MEM_PROFILE)