diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-01-25 21:46:35 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-01-25 21:46:35 +0000 |
| commit | aab21c3533cde8f667e06548db858237870b70e7 (patch) | |
| tree | a03fdba1832a87da835bc2d449215e4bafffd8e8 /src | |
| parent | 1fad5d49c918518c392a0b8b665d9447ede6c201 (diff) | |
updated for version 7.0044
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make_mvc.mak | 7 | ||||
| -rw-r--r-- | src/message.c | 1 | ||||
| -rw-r--r-- | src/proto.h | 4 | ||||
| -rw-r--r-- | src/vim.h | 18 |
4 files changed, 23 insertions, 7 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 5cc0a92f5d..5fbb2c2444 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -501,9 +501,14 @@ PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib MZSCHEME_VER = 205_000 !endif 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 !endif +MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj +!endif # Perl interface !ifdef PERL diff --git a/src/message.c b/src/message.c index 173a64f162..6f2e7c1556 100644 --- 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; } /* diff --git a/src/proto.h b/src/proto.h index f8920dae0e..50e64b47e0 100644 --- a/src/proto.h +++ b/src/proto.h @@ -240,11 +240,11 @@ extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path, #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 @@ -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 required for the prototypes. */ # 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 required for the prototypes. */ /* stop using fastcall for Borland */ #if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG) -# pragma option -p. + #pragma option -p. #endif #if defined(MEM_PROFILE) |