From 362e1a30c6f3527d5d0efc328c2fb448290cd6fc Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 6 Mar 2006 23:29:24 +0000 Subject: updated for version 7.0216 --- src/GvimExt/Makefile | 5 +- src/GvimExt/gvimext.h | 6 + src/GvimExt/gvimext.rc | 2 +- src/INSTALLpc.txt | 420 ++++++++++++++++++++++++++----------------------- src/Make_mvc.mak | 53 ++++--- src/dosinst.h | 9 +- src/edit.c | 10 +- src/eval.c | 43 +++-- src/ex_cmds.c | 16 +- src/ex_cmds.h | 6 +- src/ex_cmds2.c | 2 +- src/ex_docmd.c | 9 ++ src/ex_getln.c | 128 +++++++++++++-- src/feature.h | 6 +- src/fileio.c | 4 +- src/globals.h | 5 +- src/gui.h | 2 + src/gui_beval.c | 2 +- src/gui_gtk_x11.c | 38 ++++- src/gui_w32.c | 22 ++- src/if_cscope.c | 2 +- src/if_mzsch.c | 2 +- src/if_ole.cpp | 2 +- src/if_perl.xs | 5 +- src/if_ruby.c | 2 +- src/if_sniff.c | 2 +- src/if_tcl.c | 2 +- src/main.c | 4 +- src/mbyte.c | 80 +++++----- src/memfile.c | 2 +- src/memline.c | 2 +- src/message.c | 8 +- src/misc1.c | 9 +- src/msvcsetup.bat | 12 ++ src/netbeans.c | 2 +- src/normal.c | 9 +- src/ops.c | 2 +- src/option.c | 36 ++++- src/option.h | 3 + src/os_msdos.c | 2 +- src/os_mswin.c | 2 +- src/os_win16.c | 2 +- src/os_win32.c | 3 +- src/proto/eval.pro | 2 +- src/proto/mbyte.pro | 4 +- src/proto/spell.pro | 1 + src/regexp.c | 100 +++++++++--- src/screen.c | 263 ++++++++++++++++++++----------- src/spell.c | 141 +++++++++++++++-- src/tag.c | 2 +- src/testdir/test58.in | 14 +- src/testdir/test59.in | 14 +- src/ui.c | 14 +- src/version.h | 4 +- src/vim.h | 50 ++++-- src/vim.rc | 8 +- src/vimio.h | 16 ++ src/xxd/Make_mvc.mak | 5 +- src/xxd/xxd.c | 7 + 59 files changed, 1105 insertions(+), 523 deletions(-) create mode 100644 src/msvcsetup.bat create mode 100644 src/vimio.h (limited to 'src') diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile index d1bd2d1da7..f9dddf6ce6 100644 --- a/src/GvimExt/Makefile +++ b/src/GvimExt/Makefile @@ -16,8 +16,9 @@ all: gvimext.dll gvimext.dll: gvimext.obj \ gvimext.res - $(implib) /NOLOGO -machine:$(CPU) -def:gvimext.def $** -out:gvimext.lib - $(link) $(dlllflags) -base:0x1C000000 -out:$*.dll $** $(olelibsdll) shell32.lib gvimext.lib comctl32.lib gvimext.exp +# $(implib) /NOLOGO -machine:$(CPU) -def:gvimext.def $** -out:gvimext.lib +# $(link) $(dlllflags) -base:0x1C000000 -out:$*.dll $** $(olelibsdll) shell32.lib gvimext.lib comctl32.lib gvimext.exp + $(link) $(lflags) -dll -def:gvimext.def -base:0x1C000000 -out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib gvimext.obj: gvimext.h diff --git a/src/GvimExt/gvimext.h b/src/GvimExt/gvimext.h index 5eb50048b0..d68807320a 100644 --- a/src/GvimExt/gvimext.h +++ b/src/GvimExt/gvimext.h @@ -33,6 +33,12 @@ #define INC_OLE2 // WIN32, get ole2 from windows.h +/* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */ +#if _MSC_VER >= 1400 +# define _CRT_SECURE_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE +#endif + #include #include #include diff --git a/src/GvimExt/gvimext.rc b/src/GvimExt/gvimext.rc index 19a5d0ca7c..22102db75f 100644 --- a/src/GvimExt/gvimext.rc +++ b/src/GvimExt/gvimext.rc @@ -8,7 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #ifndef __BORLANDC__ -# include "afxres.h" +# include "winresrc.h" #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index d220e0e1bd..106c767037 100644 --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -3,215 +3,196 @@ INSTALLpc.txt - Installation of Vim on PC This file contains instructions for compiling Vim. If you already have an executable version of Vim, you don't need this. -More information can be found here: +More information can be found here: (Very stale now.) - http://mywebpage.netscape.com/sharppeople/vim/howto/ + http://mywebpage.netscape.com/sharppeople/vim/howto/ The file "feature.h" can be edited to match your preferences. You can skip this, then you will get the default behavior as is documented, which should be fine for most people. +With the exception of the last two sections (Windows 3.1 and MS-DOS), +this document assumes that you are building Vim for Win32 +(Windows NT/2000/XP/2003/Vista and Windows 95/98/Me) + Contents: -1. MS-DOS -2. Win32 (Windows XP/NT and Windows 95/98) -3. Windows NT with OpenNT -4. Windows 3.1 -5. Using Mingw -6. Cross compiling for Win32 from a Linux machine -7. Building with Python support -8. Building with MzScheme support +1. Microsoft Visual C++ +2. Using MinGW +3. Cygwin +4. Borland +5. Cross compiling for Win32 from a Linux machine +6. Building with Python support +7. Building with MzScheme support +8. Windows 3.1 +9. MS-DOS +The currently preferred method is using the free Visual C++ Toolkit 2003. -1. MS-DOS -========= -Summary: -ren Make_bc3.mak Makefile; make 16 bit, Borland C++ and Turbo C++ -ren Make_tcc.mak Makefile; make 16 bit, Turbo C -make -f Make_djg.mak 32 bit, DJGPP 2.0 -make -f Make_bc5.mak 32 bit, Borland C++ 5.x (edit it to - define DOS) +1. Microsoft Visual C++ +======================= -Warning: Be sure to use the right make.exe. Microsoft C make doesn't work; -Borland make only works with Make_bc3.mak, Make_bc5.mak and Make_tcc.mak; -DJGPP/GNU make must be used for Make_djg.mak. +Visual Studio +------------- -The Borland C++ compiler has been used to generate the MS-DOS executable; it -should work without problems. You will probably have to change the paths for -LIBPATH and INCLUDEPATH in the start of the Makefile. You will get two -warnings which can be ignored (one about _chmod and one about precompiled -header files). +Building with Visual Studio (VS 98, VS .NET, VS .NET 2003, and VS .NET 2005) +is straightforward. (These instructions should also work for VS 4 and VS 5.) -The "spawno" library by Ralf Brown was used in order to free memory when Vim -starts a shell or other external command. Only about 200 bytes are taken from -conventional memory. When recompiling get the spawno library from Simtel, -directory "msdos/c". It is called something like "spwno413.zip". Or follow -the instructions in the Makefile to remove the library. +To build Vim from the command line with MSVC, use Make_mvc.mak. +Visual Studio installed a batch file called vcvars32.bat, which you must +run to set up paths for nmake and MSVC. -The Turbo C Makefile has not been tested much lately. It is included for those -that don't have C++. You may need to make a few changes to get it to work. +nmake -f Make_mvc.mak console Win32 SDK or Microsoft Visual C++ +nmake -f Make_mvc.mak GUI=yes GUI Microsoft Visual C++ +nmake -f Make_mvc.mak OLE=yes OLE Microsoft Visual C++ +nmake -f Make_mvc.mak PERL=C:\Perl PYTHON=C:\Python etc. + Perl, Python, etc. -DJGPP needs to be installed properly to compile Vim; you need a lot of things -before it works. When your setup is OK, Vim should compile with just one -warning (about an argument to signal()). +Make_mvc.mak allows a Vim to be built with various different features and +debug support. Debugging with MS Devstudio is provided by Make_dvc.mak. +For a description of the use of Make_dvc.mak, look in Make_mvc.mak. -Make_bc5.mak is for those that have Borland C++ 5.0 or later. At the top of -the file, there are some variables you can change to make either a 32-bit -Windows exe (GUI or console mode), or a 16-bit MS-DOS version. -NOTE: multi-byte support is broken in the Borland libraries, not everything -will work properly! Esp. handling multi-byte file names. +For compiling Gvim with IME support on far-east Windows, add IME=yes +to the parameters you pass to Make_mvc.mak. -If you get all kinds of strange error messages when compiling, try adding -changing the file format from "unix" to "dos". +To build Vim from within the Visual Studio IDE, open the Make_ivc.mak project. +(Note: Make_ivc.mak is not as rich as Make_mvc.mak, which allows for +far more configuration.) Make_ivc.mak can also be built with nmake. + +nmake -f Make_ivc.mak CFG="Vim - Win32 Release gvim" + GUI Microsoft Visual C++ 4.x or later +nmake -f Make_ivc.mak CFG="Vim - Win32 Release gvim OLE" + OLE Microsoft Visual C++ 4.x or later +See the specific files for comments and options. -2. Win32 (Windows NT/XP and Windows 95/98) -==================================== +These files have been supplied by George V. Reilly, Ben Singer, Ken Scott and +Ron Aaron; they have been tested. -Summary: -vcvars32 Setup paths for nmake and MSVC -nmake -f Make_mvc.mak console Win32 SDK or Microsoft Visual C++ -nmake -f Make_mvc.mak GUI=yes GUI Microsoft Visual C++ -nmake -f Make_mvc.mak OLE=yes OLE Microsoft Visual C++ -nmake -f Make_mvc.mak PERL=C:\Perl PYTHON=C:\Python etc. - Perl, Python, etc. - Microsoft Visual C++ +Visual C++ Toolkit 2003 +----------------------- -make -f Make_bc5.mak GUI Borland C++ 5.x -make -f Make_bc5.mak console Borland C++ 5.x (change the file) -nmake -f Make_ivc.mak CFG="Vim - Win32 Release gvim" - GUI Microsoft Visual C++ 4.x or later -nmake -f Make_ivc.mak CFG="Vim - Win32 Release gvim OLE" - OLE Microsoft Visual C++ 4.x or later +You can download the Microsoft Visual C++ Toolkit 2003 from + http://msdn.microsoft.com/visualc/vctoolkit2003/ +This contains the command-line tools (compiler, linker, CRT headers, +and libraries) for Visual Studio .NET 2003, but not the Visual Studio IDE. +To compile and debug Vim with the VC2003 Toolkit, you will also need +|ms-platform-sdk|, |dotnet-1.1-redist|, |dotnet-1.1-sdk|, +and |windbg-download|. -make -f Make_cyg.mak various Cygnus gcc -make -f Make_ming.mak various MingW with gcc +It's easier to download Visual C++ 2005 Express Edition, |msvc-2005-express|. +The advantage of the VC 2003 Toolkit is that it will be freely available +long after VC 2005 Express Edition stops being free in November 2006. -See the specific files for comments and options. +The free Code::Blocks IDE works with the VC2003 Toolkit, as described at + http://wiki.codeblocks.org/index.php?title=Integrating_Microsoft_Visual_Toolkit_2003_with_Code::Blocks_IDE +(This site also takes you through configuring a number of other +free C compilers for Win32.) -These files have been supplied by George V. Reilly, Ben Singer, Ken Scott and -Ron Aaron; they have been tested. The Cygnus one many not fully work yet. -With Cygnus gcc you can use the Unix Makefile instead (you need to get the -Unix archive then). Then you get a Cygwin application (feels like Vim is -runnin on Unix), while with Make_cyg.mak you get a Windows application (like -with the other makefiles). +To compile Vim using the VC2003 Toolkit and Make_mvc.mak, you must first +execute the following commands in a cmd.exe window (the msvcsetup.bat batch +file can be used): + + set PATH=%SystemRoot%\Microsoft.NET\Framework\v1.1.4322;%PATH% + call "%VCToolkitInstallDir%vcvars32.bat" + set MSVCVer=7.1 + call "%ProgramFiles%\Microsoft Platform SDK\SetEnv.Cmd" + set LIB=%ProgramFiles%\Microsoft Visual Studio .NET 2003\Vc7\lib;%LIB% -You can also use the Visual C++ IDE: use File/Open workspace, select the -Make_ivc.mak file, then select Build/Build all. This builds the GUI version -by default. +Now you can build Vim with Make_mvc.mak. -Vim for Win32 compiles with the Microsoft Visual C++ 2.0 compiler and later, -and with the Borland C++ 4.5 32-bit compiler and later. It compiles on -Windows 95 and all four NT platforms: i386, Alpha, MIPS, and PowerPC. The -NT/i386 and the Windows 95 binaries are identical. Use Make_mvc.mak to -compile with Visual C++ and Make_bc5.mak to compile with Borland C++. -Make_mvc.mak allows a Vim to be built with various different features and -debug support. Debugging with MS Devstudio is provided by Make_dvc.mak. -For a description of the use of Make_dvc.mak, look in Make_mvc.mak. +Getting the Windows Platform SDK *ms-platform-sdk* -For compiling Gvim with IME support on far-east Windows, uncomment the -MULTI_BYTE_IME define in the src/feature.h file before compiling. +You will also need a copy of the Windows Platform SDK from + http://www.microsoft.com/msdownload/platformsdk/sdkupdate/ +Specifically, you need the Windows Core SDK subset of the Platform SDK, +which contains the Windows headers and libraries. -The Win32 console binary was compiled with Visual C++ version 5.0, using -Make_mvc.mak and Make_bc5.mak (Borland C). Other compilers should also work. -If you get all kinds of strange error messages when compiling (you shouldn't -with the Microsoft or Borland 32-bit compilers), try adding characters -at the end of each line. -You probably need to run "vcvars32" before using "nmake". +Getting the .NET Framework 1.1 Runtime *dotnet-1.1-redist* -For making the Win32s version, you need Microsoft Visual C++ 4.1 OR EARLIER. -In version 4.2 support for Win32s was dropped! Use this command: - nmake -f Make_mvc.mak GUI=yes - -See the respective Makefiles for more comments. - - -3. Windows NT with OpenNT -========================= - -(contributed by Michael A. Benzinger) - -Building Vim on OpenNT 2.0 on Windows NT 4.0, with Softway's prerelease gcc: -1. export CONFIG_SHELL=//D/OpenNT/bin/sh -2. Make the following exports for modifying config.mk: - export CFLAGS=-O -Wshadow - export X_PRE_LIBS=-lXmu -2. Run configure as follows: - configure --prefix=/vim --bindir=/bin/opennt --enable-gui=Motif - If you don't have OpenNTif (Motif support), use this: - configure --prefix=/vim --bindir=/bin/opennt --enable-gui=Athena -3. Edit Makefile to perform the following since the Makefile include syntax - differs from that of gmake: - #include config.mk - .include "config.mk" -4. Change all install links to be "ln -f" and not "ln -s". -5. Change to the 'ctags' directory and configure. -6. Edit the Makefile and remove spurious spaces from lines 99 and 114. -7. Change slink to "ln -f" from "ln -s". -8. Return to the src directory. -9. make - - -4. Windows 3.1x -=============== +You need the .NET Framework 1.1 Redistributable Package from + http://www.microsoft.com/downloads/details.aspx?familyid=262d25e3-f589-4842-8157-034d1e7cf3a3 +or from Windows Update: + http://windowsupdate.microsoft.com/ +This is needed to install |dotnet-1.1-sdk|. It also contains cvtres.exe, +which is needed to link Vim. -make -f Make_w16.mak 16 bit, Borland C++ 5.0 -Warning: Be sure to use the right make.exe. It should be Borland make. +Getting the .NET Framework 1.1 SDK *dotnet-1.1-sdk* -You will almost certainly have to change the paths for libs and include files -in the Makefile. Look for "D:\BC5" and "ctl3dv2". You will get a number of -warnings which can be ignored ( _chmod, precompiled header files, and -"possibly incorrect assignment"). +You need the .NET Framework 1.1 SDK from + http://www.microsoft.com/downloads/details.aspx?familyid=9b3a2ca6-3647-4070-9f41-a333c6b9181d +This contains some additional libraries needed to compile Vim, +such as msvcrt.lib. You must install |dotnet-1.1-redist| before +installing the .NET 1.1 SDK. -The makefile should also work for BC++ 4.0 and 4.5, but may need tweaking to -remove unsupported compiler & liker options. +Getting the WinDbg debugger *windbg-download* + +The Debugging Tools for Windows can be downloaded from + http://www.microsoft.com/whdc/devtools/debugging/default.mspx +This includes the WinDbg debugger, which you will want if you ever need +to debug Vim itself. An earlier version of the Debugging Tools +is also available through the Platform SDK, |ms-platform-sdk|. -5. Mingw + +Visual C++ 2005 Express Edition +------------------------------- + +Visual C++ 2005 Express Edition can be downloaded for free +before November 2006 from + http://msdn.microsoft.com/vstudio/express/visualC/default.aspx +This includes the IDE and the debugger. You will also need +|ms-platform-sdk|. You can build Vim with Make_mvc.mak. + +Instructions for integrating the Platform SDK into VC Express: + http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/default.aspx + + +2. MinGW ======== (written by Ron Aaron: ) -This is about how to produce a Win32 binary of gvim with Mingw. +This is about how to produce a Win32 binary of gvim with MinGW. First, you need to get the 'mingw32' compiler, which is free for the download at: - http://www.mingw.org/ + http://www.mingw.org/ Once you have downloaded the compiler binaries, unpack them on your hard disk somewhere, and put them on your PATH. If you are on Win95/98 you can edit your AUTOEXEC.BAT file with a line like: - set PATH=C:\GCC-2.95.2\BIN;%PATH% + set PATH=C:\GCC-2.95.2\BIN;%PATH% -or on NT/2000, go to the Control Panel, System, and edit the environment from -there. +or on NT/2000/XP, go to the Control Panel, (Performance and Maintenance), +System, Advanced, and edit the environment from there. -Test if gcc is on your path. From a CMD (or COMMAND on '95/98): +Test if gcc is on your path. From a CMD (or COMMAND on '95/98) window: - C:\> gcc --version - 2.95.2 + C:\> gcc --version + 2.95.2 - C:\> make --version - GNU Make version 3.77 (...etc...) + C:\> make --version + GNU Make version 3.77 (...etc...) Now you are ready to rock 'n' roll. Unpack the vim sources (look on www.vim.org for exactly which version of the vim files you need). Change directory to 'vim\src': - C:\> cd vim\src - C:\VIM\SRC> + C:\> cd vim\src + C:\VIM\SRC> and you type: - make -f Make_ming.mak gvim.exe + make -f Make_ming.mak gvim.exe After churning for a while, you will end up with 'gvim.exe' in the 'vim\src' directory. @@ -224,10 +205,9 @@ the 'gvim.exe' to 'vim.exe' in the 'make' commands given above. If you are dismayed by how big the EXE is, I strongly recommend you get 'UPX' (also free!) and compress the file (typical compression is 50%). UPX can be found at - http://upx.tsx.org/ - + http://www.upx.org/ -ADDITION: NLS support with Mingw +ADDITION: NLS support with MinGW (by Eduardo F. Amatria ) @@ -235,58 +215,44 @@ If you want National Language Support, read the file src/po/README_mingw.txt. You need to uncomment lines in Make_ming.mak to have NLS defined. -6. Cross compiling for Win32 from a Linux machine +3. Cygwin +========= + +Use Make_cyg.mak with Cygwin's GCC. See + http://users.skynet.be/antoine.mechelynck/vim/compile.htm + +The Cygnus one many not fully work yet. +With Cygnus gcc you can use the Unix Makefile instead (you need to get the +Unix archive then). Then you get a Cygwin application (feels like Vim is +runnin on Unix), while with Make_cyg.mak you get a Windows application (like +with the other makefiles). + + +4. Borland +=========== + +Use Make_bc5.mak with Borland C++ 5.x. See + http://users.skynet.be/antoine.mechelynck/vim/compile.htm + + +5. Cross compiling for Win32 from a Linux machine ================================================= -(written by Ron Aaron: with help from -Martin Kahlert ) +[Update of 1) needs to be verified] If you like, you can compile the 'mingw' Win32 version from the comfort of your Linux (or other unix) box. To do this, you need to follow a few steps: - - 1) Install the mingw32 cross-compiler (if you have it, go to step 2) - 1a) from 'ftp://ftp.nanotech.wisc.edu/pub/khan/gnu-win32/mingw32/snapshots/gcc-2.95.2-1', - get: - binutils-19990818-1-src.tar.gz - mingw-msvcrt-20000203.zip - gcc-2.95.2-1-x86-win32.diff.gz - 1b) from 'http://gcc.gnu.org/' get: - gcc-2.95.2.tar.gz - 1c) create a place to put the compiler source and binaries: - (assuming you are in the home directory) - mkdir gcc-bin - mkdir gcc-src - 1d) unpack the sources: - cd gcc-src - tar xzf ../binutils-19990818-1-src.tar.gz - tar xzf ../gcc-2.95.2.tar.gz - unzip ../mingw-msvcrt-20000203 - 1e) build the different tools: - export PREFIX=~/gcc-bin/ - cd gcc-2.95.2 - zcat ../gcc-2.95.2-1-x86-win32.diff.gz | patch -p1 -E - cd ../binutils-19990818 - ./configure --target=i586-pc-mingw32msvc --prefix=$PREFIX - make - make install - cd ../gcc-2.95.2 - ./configure --target=i586-pc-mingw32msvc \ - --with-libs=~/gcc-bin/i386-mingw32msvc/lib \ - --with-headers=~/gcc-bin/i386-mingw32msvc/include \ - --enable-languages=c++ \ - --prefix=$PREFIX - make - make install - 1f) Add $PREFIX/bin to your $PATH. - - 2) get the *unix* version of the vim sources - 3) in 'Make_ming.mak', set 'CROSS' to '1' instead of '0'. - 4) make -f Make_ming.mak gvim.exe + 1) Install the mingw32 cross-compiler. See + http://www.libsdl.org/extras/win32/cross/README.txt + 2) get the *unix* version of the vim sources + 3) in 'Make_ming.mak', set 'CROSS' to '1' instead of '0'. + 4) make -f Make_ming.mak gvim.exe Now you have created the Windows binary from your Linux box! Have fun... -7. Building with Python support -================================================= + +6. Building with Python support +=============================== (written by Ron Aaron: ) @@ -312,8 +278,9 @@ Now just do: and you will end up with a Python-enabled, Win32 version. Enjoy! -8. Building with MzScheme support -================================================= + +7. Building with MzScheme support +================================= (written by Sergey Khorev ) @@ -341,8 +308,71 @@ libmzschXXXXXXX.dll and libmzgcXXXXXXX.dll should be copied from dir or even MzScheme home). Pass that path as MZSCHEME_DLLS parameter for Make. E.g., -make -fMake_cyg.mak MZSCHEME=d:/Develop/MzScheme MZSCHEME_VER=209_000 +make -f Make_cyg.mak MZSCHEME=d:/Develop/MzScheme MZSCHEME_VER=209_000 MZSCHEME_DLLS=c:/Temp DYNAMIC_MZSCHEME=no -After successful build these dlls can be freely removed, leaving them in +After a successful build, these dlls can be freely removed, leaving them in %WINDOWS%\System32 only. + + +8. Windows 3.1x +=============== + +make -f Make_w16.mak 16 bit, Borland C++ 5.0 + +Warning: Be sure to use the right make.exe. It should be Borland make. + +You will almost certainly have to change the paths for libs and include files +in the Makefile. Look for "D:\BC5" and "ctl3dv2". You will get a number of +warnings which can be ignored ( _chmod, precompiled header files, and +"possibly incorrect assignment"). + +The makefile should also work for BC++ 4.0 and 4.5, but may need tweaking to +remove unsupported compiler & liker options. + +For making the Win32s version, you need Microsoft Visual C++ 4.1 OR EARLIER. +In MSVC 4.2 support for Win32s was dropped! Use this command: + nmake -f Make_mvc.mak GUI=yes + + +9. MS-DOS +========= + +Summary: +ren Make_bc3.mak Makefile; make 16 bit, Borland C++ and Turbo C++ +ren Make_tcc.mak Makefile; make 16 bit, Turbo C +make -f Make_djg.mak 32 bit, DJGPP 2.0 +make -f Make_bc5.mak 32 bit, Borland C++ 5.x (edit it to + define DOS) + +Warning: Be sure to use the right make.exe. Microsoft C make doesn't work; +Borland make only works with Make_bc3.mak, Make_bc5.mak and Make_tcc.mak; +DJGPP/GNU make must be used for Make_djg.mak. + +The Borland C++ compiler has been used to generate the MS-DOS executable; it +should work without problems. You will probably have to change the paths for +LIBPATH and INCLUDEPATH in the start of the Makefile. You will get two +warnings which can be ignored (one about _chmod and one about precompiled +header files). + +The "spawno" library by Ralf Brown was used in order to free memory when Vim +starts a shell or other external command. Only about 200 bytes are taken from +conventional memory. When recompiling get the spawno library from Simtel, +directory "msdos/c". It is called something like "spwno413.zip". Or follow +the instructions in the Makefile to remove the library. + +The Turbo C Makefile has not been tested much lately. It is included for those +that don't have C++. You may need to make a few changes to get it to work. + +DJGPP needs to be installed properly to compile Vim; you need a lot of things +before it works. When your setup is OK, Vim should compile with just one +warning (about an argument to signal()). + +Make_bc5.mak is for those that have Borland C++ 5.0 or later. At the top of +the file, there are some variables you can change to make either a 32-bit +Windows exe (GUI or console mode), or a 16-bit MS-DOS version. +NOTE: multi-byte support is broken in the Borland libraries, not everything +will work properly! Esp. handling multi-byte file names. + +If you get all kinds of strange error messages when compiling, try adding +changing the file format from "unix" to "dos". diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index ca94386ce5..e569b9a832 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -131,9 +131,9 @@ ### See feature.h for a list of optionals. # If you want to build some optional features without modifying the source, # you can set DEFINES on the command line, e.g., -# nmake -f makefile.mvc "DEFINES=-DEMACS_TAGS" +# nmake -f Make_mvc.mvc "DEFINES=-DEMACS_TAGS" -# Build on both Windows NT and Windows 95 +# Build on both Windows NT/XP and Windows 9x TARGETOS = BOTH @@ -167,12 +167,12 @@ OBJDIR = $(OBJDIR)Z OBJDIR = $(OBJDIR)d !endif -# ntwin32.mak requires that CPU be set appropriately +# Win32.mak requires that CPU be set appropriately !ifdef PROCESSOR_ARCHITECTURE -# We're on Windows NT or using VC 6 +# We're on Windows NT or using VC 6+ CPU = $(PROCESSOR_ARCHITECTURE) -! if "$(CPU)" == "x86" +! if ("$(CPU)" == "x86") || ("$(CPU)" == "X86") CPU = i386 ! endif !else # !PROCESSOR_ARCHITECTURE @@ -190,17 +190,12 @@ MAKEFLAGS_GVIMEXT = DEBUG=yes !endif -# Build a multithreaded version for the Windows 95 dead keys hack -# Commented out because it doesn't work. -# MULTITHREADED = 1 - - # Get all sorts of useful, standard macros from the SDK. (Note that # MSVC 2.2 does not install in the \msvc20\include # directory, but you can find it in \msvc20\include on the CD-ROM. # You may also need from the same place.) -!include +!include #>>>>> path of the compiler and linker; name of include and lib directories @@ -263,12 +258,14 @@ XPM_INC = -I $(XPM)\include !endif !endif +# Set which version of the CRT to use !if defined(USE_MSVCRT) CVARS = $(cvarsdll) -!elseif defined(MULTITHREADED) -CVARS = $(cvarsmt) +# !elseif defined(MULTITHREADED) +# CVARS = $(cvarsmt) !else -CVARS = $(cvars) +# CVARS = $(cvars) +CVARS = $(cvarsmt) !endif # need advapi32.lib for GetUserName() @@ -276,7 +273,7 @@ CVARS = $(cvars) # gdi32.lib and comdlg32.lib for printing support # ole32.lib and uuid.lib are needed for FEAT_SHORTCUT CON_LIB = advapi32.lib shell32.lib gdi32.lib comdlg32.lib ole32.lib uuid.lib -!if "$(VC6)" == "yes" +!if "$(DELAYLOAD)" == "yes" CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib !endif @@ -340,10 +337,14 @@ RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG ! ifdef USE_MSVCRT CFLAGS = $(CFLAGS) -MD LIBC = msvcrt.lib -! elseif defined(MULTITHREADED) -LIBC = libcmt.lib +# CFLAGS = $(CFLAGS) $(cvarsdll) +# ! elseif defined(MULTITHREADED) +# LIBC = libcmt.lib +# CFLAGS = $(CFLAGS) $(cvarsmt) ! else -LIBC = libc.lib +# LIBC = libc.lib +LIBC = libcmt.lib +# CFLAGS = $(CFLAGS) $(cvars) ! endif !else # DEBUG VIM = vimd @@ -358,10 +359,14 @@ LIBC = /fixed:no ! ifdef USE_MSVCRT CFLAGS = $(CFLAGS) -MDd LIBC = $(LIBC) msvcrtd.lib -! elseif defined(MULTITHREADED) -LIBC = $(LIBC) libcmtd.lib +# CFLAGS = $(CFLAGS) $(cvarsdll) +# ! elseif defined(MULTITHREADED) +# LIBC = $(LIBC) libcmtd.lib +# CFLAGS = $(CFLAGS) $(cvarsmt) ! else -LIBC = $(LIBC) libcd.lib +# LIBC = $(LIBC) libcd.lib +LIBC = $(LIBC) libcmtd.lib +# CFLAGS = $(CFLAGS) $(cvars) ! endif !endif # DEBUG @@ -666,7 +671,7 @@ CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES) # on a crash (doesn't add overhead to the executable). # CFLAGS = $(CFLAGS) /Zi /Fd$(OUTDIR)/ -LINK_PDB = /PDB:$(OUTDIR)/$(VIM).pdb -debug:full -debugtype:cv,fixup +LINK_PDB = /PDB:$(OUTDIR)/$(VIM).pdb -debug # -debug:full -debugtype:cv,fixup # # End extra feature include @@ -1004,4 +1009,8 @@ proto.h: \ proto/window.pro \ $(NETBEANS_PRO) +.cod.c: + $(CC) $(CFLAGS) /FAc $< + + # vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0: diff --git a/src/dosinst.h b/src/dosinst.h index 5ff4d67a0c..7b53e5008f 100644 --- a/src/dosinst.h +++ b/src/dosinst.h @@ -9,6 +9,13 @@ /* * dosinst.h: Common code for dosinst.c and uninstal.c */ + +/* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */ +#if _MSC_VER >= 1400 +# define _CRT_SECURE_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE +#endif + #include #include #include @@ -16,7 +23,7 @@ #include #ifndef UNIX_LINT -# include +# include "vimio.h" # include # ifndef __CYGWIN__ diff --git a/src/edit.c b/src/edit.c index 3ad12a7a6a..3a7a8ced6a 100644 --- a/src/edit.c +++ b/src/edit.c @@ -7604,7 +7604,7 @@ ins_bs(c, mode, inserted_space_p) int in_indent; int oldState; #ifdef FEAT_MBYTE - int p1, p2; + int cpc[MAX_MCO]; /* composing characters */ #endif /* @@ -7920,16 +7920,16 @@ ins_bs(c, mode, inserted_space_p) { #ifdef FEAT_MBYTE if (enc_utf8 && p_deco) - (void)utfc_ptr2char(ml_get_cursor(), &p1, &p2); + (void)utfc_ptr2char(ml_get_cursor(), cpc); #endif (void)del_char(FALSE); #ifdef FEAT_MBYTE /* - * If p1 or p2 is non-zero, there are combining characters we - * need to take account of. Don't back up before the base + * If there are combining characters and 'delcombine' is set + * move the cursor back. Don't back up before the base * character. */ - if (enc_utf8 && p_deco && (p1 != NUL || p2 != NUL)) + if (enc_utf8 && p_deco && cpc[0] != NUL) inc_cursor(); #endif #ifdef FEAT_RIGHTLEFT diff --git a/src/eval.c b/src/eval.c index 1c7d0f8c14..4336a26334 100644 --- a/src/eval.c +++ b/src/eval.c @@ -11,7 +11,7 @@ * eval.c: Expression evaluation. */ #if defined(MSDOS) || defined(MSWIN) -# include /* for mch_open(), must be before vim.h */ +# include "vimio.h" /* for mch_open(), must be before vim.h */ #endif #include "vim.h" @@ -718,7 +718,7 @@ static void call_user_func __ARGS((ufunc_T *fp, int argcount, typval_T *argvars, static void add_nr_var __ARGS((dict_T *dp, dictitem_T *v, char *name, varnumber_T nr)); static win_T *find_win_by_nr __ARGS((typval_T *vp)); static int searchpair_cmn __ARGS((typval_T *argvars, pos_T *match_pos)); -static int search_cmn __ARGS((typval_T *argvars, pos_T *match_pos)); +static int search_cmn __ARGS((typval_T *argvars, pos_T *match_pos, int *flagsp)); /* Character used as separated in autoload function/variable names. */ #define AUTOLOAD_CHAR '#' @@ -1171,18 +1171,28 @@ skip_expr(pp) * Return pointer to allocated memory, or NULL for failure. */ char_u * -eval_to_string(arg, nextcmd) +eval_to_string(arg, nextcmd, dolist) char_u *arg; char_u **nextcmd; + int dolist; /* turn List into sequence of lines */ { typval_T tv; char_u *retval; + garray_T ga; if (eval0(arg, &tv, nextcmd, TRUE) == FAIL) retval = NULL; else { - retval = vim_strsave(get_tv_string(&tv)); + if (dolist && tv.v_type == VAR_LIST) + { + ga_init2(&ga, (int)sizeof(char), 80); + list_join(&ga, tv.vval.v_list, (char_u *)"\n", TRUE, 0); + ga_append(&ga, NUL); + retval = (char_u *)ga.ga_data; + } + else + retval = vim_strsave(get_tv_string(&tv)); clear_tv(&tv); } @@ -1206,7 +1216,7 @@ eval_to_string_safe(arg, nextcmd, use_sandbox) if (use_sandbox) ++sandbox; ++textlock; - retval = eval_to_string(arg, nextcmd); + retval = eval_to_string(arg, nextcmd, FALSE); if (use_sandbox) --sandbox; --textlock; @@ -13273,25 +13283,27 @@ get_search_arg(varp, flagsp) * Shared by search() and searchpos() functions */ static int -search_cmn(argvars, match_pos) +search_cmn(argvars, match_pos, flagsp) typval_T *argvars; pos_T *match_pos; + int *flagsp; { + int flags; char_u *pat; pos_T pos; pos_T save_cursor; int save_p_ws = p_ws; int dir; - int flags = 0; int retval = 0; /* default: FAIL */ long lnum_stop = 0; int options = SEARCH_KEEP; int subpatnum; pat = get_tv_string(&argvars[0]); - dir = get_search_arg(&argvars[1], &flags); /* may set p_ws */ + dir = get_search_arg(&argvars[1], flagsp); /* may set p_ws */ if (dir == 0) goto theend; + flags = *flagsp; if (flags & SP_START) options |= SEARCH_START; if (flags & SP_END) @@ -13359,7 +13371,9 @@ f_search(argvars, rettv) typval_T *argvars; typval_T *rettv; { - rettv->vval.v_number = search_cmn(argvars, NULL); + int flags = 0; + + rettv->vval.v_number = search_cmn(argvars, NULL, &flags); } /* @@ -13649,13 +13663,16 @@ f_searchpos(argvars, rettv) pos_T match_pos; int lnum = 0; int col = 0; + int n; + int flags = 0; rettv->vval.v_number = 0; if (rettv_list_alloc(rettv) == FAIL) return; - if (search_cmn(argvars, &match_pos) > 0) + n = search_cmn(argvars, &match_pos, &flags); + if (n > 0) { lnum = match_pos.lnum; col = match_pos.col; @@ -13663,7 +13680,8 @@ f_searchpos(argvars, rettv) list_append_number(rettv->vval.v_list, (varnumber_T)lnum); list_append_number(rettv->vval.v_list, (varnumber_T)col); - + if (flags & SP_SUBPAT) + list_append_number(rettv->vval.v_list, (varnumber_T)n); } @@ -15675,6 +15693,7 @@ f_winrestview(argvars, rettv) curwin->w_cursor.coladd = get_dict_number(dict, (char_u *)"coladd"); #endif curwin->w_curswant = get_dict_number(dict, (char_u *)"curswant"); + curwin->w_set_curswant = FALSE; curwin->w_topline = get_dict_number(dict, (char_u *)"topline"); #ifdef FEAT_DIFF @@ -16208,7 +16227,7 @@ make_expanded_name(in_start, expr_start, expr_end, in_end) c1 = *in_end; *in_end = NUL; - temp_result = eval_to_string(expr_start + 1, &nextcmd); + temp_result = eval_to_string(expr_start + 1, &nextcmd, FALSE); if (temp_result != NULL && nextcmd == NULL) { retval = alloc((unsigned)(STRLEN(temp_result) + (expr_start - in_start) diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 71766b910d..22bbd45dda 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -52,12 +52,12 @@ do_ascii(eap) char buf2[20]; char_u buf3[7]; #ifdef FEAT_MBYTE - int c1 = 0; - int c2 = 0; + int cc[MAX_MCO]; + int ci = 0; int len; if (enc_utf8) - c = utfc_ptr2char(ml_get_cursor(), &c1, &c2); + c = utfc_ptr2char(ml_get_cursor(), cc); else #endif c = gchar_cursor(); @@ -95,9 +95,7 @@ do_ascii(eap) _("<%s>%s%s %d, Hex %02x, Octal %03o"), transchar(c), buf1, buf2, c, c, c); #ifdef FEAT_MBYTE - c = c1; - c1 = c2; - c2 = 0; + c = cc[ci++]; #endif } @@ -120,9 +118,9 @@ do_ascii(eap) vim_snprintf((char *)IObuff + len, IOSIZE - len, c < 0x10000 ? _("> %d, Hex %04x, Octal %o") : _("> %d, Hex %08x, Octal %o"), c, c, c); - c = c1; - c1 = c2; - c2 = 0; + if (ci == MAX_MCO) + break; + c = cc[ci++]; } #endif diff --git a/src/ex_cmds.h b/src/ex_cmds.h index f66a9740d6..364803439d 100644 --- a/src/ex_cmds.h +++ b/src/ex_cmds.h @@ -831,14 +831,16 @@ EX(CMD_split, "split", ex_splitview, BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR), EX(CMD_spellgood, "spellgood", ex_spell, BANG|RANGE|NOTADR|NEEDARG|EXTRA|TRLBAR), -EX(CMD_spellwrong, "spellwrong", ex_spell, - BANG|RANGE|NOTADR|NEEDARG|EXTRA|TRLBAR), EX(CMD_spelldump, "spelldump", ex_spelldump, BANG|TRLBAR), +EX(CMD_spellinfo, "spellinfo", ex_spellinfo, + TRLBAR), EX(CMD_spellrepall, "spellrepall", ex_spellrepall, TRLBAR), EX(CMD_spellundo, "spellundo", ex_spell, BANG|RANGE|NOTADR|NEEDARG|EXTRA|TRLBAR), +EX(CMD_spellwrong, "spellwrong", ex_spell, + BANG|RANGE|NOTADR|NEEDARG|EXTRA|TRLBAR), EX(CMD_sprevious, "sprevious", ex_previous, EXTRA|RANGE|NOTADR|COUNT|BANG|EDITCMD|ARGOPT|TRLBAR), EX(CMD_srewind, "srewind", ex_rewind, diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 0d7188ac1a..7d6a0eb6ee 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -12,7 +12,7 @@ */ #if defined(WIN32) && defined(FEAT_CSCOPE) -# include +# include "vimio.h" #endif #include "vim.h" diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 27f2ce760f..e1e5a83c4b 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -240,6 +240,7 @@ static void ex_popup __ARGS((exarg_T *eap)); # define ex_spell ex_ni # define ex_mkspell ex_ni # define ex_spelldump ex_ni +# define ex_spellinfo ex_ni # define ex_spellrepall ex_ni #endif #ifndef FEAT_MZSCHEME @@ -3289,10 +3290,17 @@ set_one_cmd_context(xp, buff) if (bow != NULL && in_quote) xp->xp_pattern = bow; xp->xp_context = EXPAND_FILES; + #ifndef BACKSLASH_IN_FILENAME /* For a shell command more chars need to be escaped. */ if (usefilter || ea.cmdidx == CMD_bang) + { xp->xp_shell = TRUE; + + /* When still after the command name expand executables. */ + if (xp->xp_pattern == skipwhite(arg)) + xp->xp_context = EXPAND_SHELLCMD; + } #endif /* Check for environment variable */ @@ -5089,6 +5097,7 @@ static struct {EXPAND_MAPPINGS, "mapping"}, {EXPAND_MENUS, "menu"}, {EXPAND_SETTINGS, "option"}, + {EXPAND_SHELLCMD, "shellcmd"}, {EXPAND_TAGS, "tag"}, {EXPAND_TAGS_LISTFILES, "tag_listfiles"}, {EXPAND_USER_VARS, "var"}, diff --git a/src/ex_getln.c b/src/ex_getln.c index 061f8c4f50..4b7a584385 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -518,7 +518,8 @@ getcmdline(firstc, count, indent) xpc.xp_context = EXPAND_NOTHING; } } - if (xpc.xp_context == EXPAND_FILES && p_wmnu) + if ((xpc.xp_context == EXPAND_FILES + || xpc.xp_context == EXPAND_SHELLCMD) && p_wmnu) { char_u upseg[5]; @@ -2466,9 +2467,9 @@ draw_cmdline(start, len) int pc, pc1; int prev_c = 0; int prev_c1 = 0; - int u8c, u8c_c1, u8c_c2; + int u8c; + int u8cc[MAX_MCO]; int nc = 0; - int dummy; /* * Do arabic shaping into a temporary buffer. This is very @@ -2495,7 +2496,7 @@ draw_cmdline(start, len) for (j = start; j < start + len; j += mb_l) { p = ccline.cmdbuff + j; - u8c = utfc_ptr2char_len(p, &u8c_c1, &u8c_c2, start + len - j); + u8c = utfc_ptr2char_len(p, u8cc, start + len - j); mb_l = utfc_ptr2len_len(p, start + len - j); if (ARABIC_CHAR(u8c)) { @@ -2505,7 +2506,7 @@ draw_cmdline(start, len) /* displaying from right to left */ pc = prev_c; pc1 = prev_c1; - prev_c1 = u8c_c1; + prev_c1 = u8cc[0]; if (j + mb_l >= start + len) nc = NUL; else @@ -2517,20 +2518,25 @@ draw_cmdline(start, len) if (j + mb_l >= start + len) pc = NUL; else - pc = utfc_ptr2char_len(p + mb_l, &pc1, &dummy, + { + int pcc[MAX_MCO]; + + pc = utfc_ptr2char_len(p + mb_l, pcc, start + len - j - mb_l); + pc1 = pcc[0]; + } nc = prev_c; } prev_c = u8c; - u8c = arabic_shape(u8c, NULL, &u8c_c1, pc, pc1, nc); + u8c = arabic_shape(u8c, NULL, &u8cc[0], pc, pc1, nc); newlen += (*mb_char2bytes)(u8c, arshape_buf + newlen); - if (u8c_c1 != 0) + if (u8cc[0] != 0) { - newlen += (*mb_char2bytes)(u8c_c1, arshape_buf + newlen); - if (u8c_c2 != 0) - newlen += (*mb_char2bytes)(u8c_c2, + newlen += (*mb_char2bytes)(u8cc[0], arshape_buf + newlen); + if (u8cc[1] != 0) + newlen += (*mb_char2bytes)(u8cc[1], arshape_buf + newlen); } } @@ -3353,6 +3359,7 @@ ExpandOne(xp, str, orig, options, mode) #ifdef CASE_INSENSITIVE_FILENAME if (xp->xp_context == EXPAND_DIRECTORIES || xp->xp_context == EXPAND_FILES + || xp->xp_context == EXPAND_SHELLCMD || xp->xp_context == EXPAND_BUFFERS) { if (TOLOWER_LOC(xp->xp_files[i][len]) != @@ -3454,6 +3461,7 @@ ExpandEscape(xp, str, numfiles, files, options) if (options & WILD_ESCAPE) { if (xp->xp_context == EXPAND_FILES + || xp->xp_context == EXPAND_SHELLCMD || xp->xp_context == EXPAND_BUFFERS || xp->xp_context == EXPAND_DIRECTORIES) { @@ -3648,6 +3656,7 @@ showmatches(xp, wildmenu) for (i = 0; i < num_files; ++i) { if (!showtail && (xp->xp_context == EXPAND_FILES + || xp->xp_context == EXPAND_SHELLCMD || xp->xp_context == EXPAND_BUFFERS)) { home_replace(NULL, files_found[i], NameBuff, MAXPATHL, TRUE); @@ -3700,6 +3709,7 @@ showmatches(xp, wildmenu) for (j = maxlen - lastlen; --j >= 0; ) msg_putchar(' '); if (xp->xp_context == EXPAND_FILES + || xp->xp_context == EXPAND_SHELLCMD || xp->xp_context == EXPAND_BUFFERS) { /* highlight directories */ @@ -3789,7 +3799,9 @@ expand_showtail(xp) char_u *end; /* When not completing file names a "/" may mean something different. */ - if (xp->xp_context != EXPAND_FILES && xp->xp_context != EXPAND_DIRECTORIES) + if (xp->xp_context != EXPAND_FILES + && xp->xp_context != EXPAND_SHELLCMD + && xp->xp_context != EXPAND_DIRECTORIES) return FALSE; end = gettail(xp->xp_pattern); @@ -3826,7 +3838,9 @@ addstar(fname, len, context) int new_len; char_u *tail; - if (context != EXPAND_FILES && context != EXPAND_DIRECTORIES) + if (context != EXPAND_FILES + && context != EXPAND_SHELLCMD + && context != EXPAND_DIRECTORIES) { /* * Matching will be done internally (on something other than files). @@ -3943,6 +3957,7 @@ addstar(fname, len, context) * EXPAND_DIRECTORIES In some cases this is used instead of the latter * when we know only directories are of interest. eg * :set dir=^I + * EXPAND_SHELLCMD After ":!cmd", ":r !cmd" or ":w !cmd". * EXPAND_SETTINGS Complete variable names. eg :set d^I * EXPAND_BOOL_SETTINGS Complete boolean variables only, eg :set no^I * EXPAND_TAGS Complete tags from the files in p_tags. eg :ta a^I @@ -4165,6 +4180,93 @@ ExpandFromContext(xp, pat, num_file, file, options) return ret; } + if (xp->xp_context == EXPAND_SHELLCMD) + { + /* + * Expand shell command. + */ + int i; + char_u *path; + int mustfree = FALSE; + garray_T ga; + char_u *buf = alloc(MAXPATHL); + int l; + char_u *s, *e; + + if (buf == NULL) + return FAIL; + + /* for ":set path=" and ":set tags=" halve backslashes for escaped + * space */ + pat = vim_strsave(pat); + for (i = 0; pat[i]; ++i) + if (pat[i] == '\\' && pat[i + 1] == ' ') + STRCPY(pat + i, pat + i + 1); + + flags |= EW_FILE | EW_EXEC; + /* For an absolute name we don't use $PATH. */ + if ((pat[0] == '.' && (vim_ispathsep(pat[1]) + || (pat[1] == '.' && vim_ispathsep(pat[2]))))) + path = (char_u *)"."; + else + path = vim_getenv((char_u *)"PATH", &mustfree); + + ga_init2(&ga, (int)sizeof(char *), 10); + for (s = path; *s != NUL; s = e) + { +#if defined(MSDOS) || defined(MSWIN) || defined(OS2) + e = vim_strchr(s, ';'); +#else + e = vim_strchr(s, ':'); +#endif + if (e == NULL) + e = s + STRLEN(s); + + l = e - s; + if (l > MAXPATHL - 5) + break; + vim_strncpy(buf, s, l); + add_pathsep(buf); + l = STRLEN(buf); + vim_strncpy(buf + l, pat, MAXPATHL - 1 - l); + + /* Expand matches in one directory of $PATH. */ + ret = expand_wildcards(1, &buf, num_file, file, flags); + if (ret == OK) + { + if (ga_grow(&ga, *num_file) == FAIL) + FreeWild(*num_file, *file); + else + { + for (i = 0; i < *num_file; ++i) + { + s = (*file)[i]; + if (STRLEN(s) > l) + { + /* Remove the path again. */ + mch_memmove(s, s + l, STRLEN(s + l) + 1); + ((char_u **)ga.ga_data)[ga.ga_len] = s; + ++ga.ga_len; + } + else + vim_free(s); + } + vim_free(*file); + } + } + if (*e != NUL) + ++e; + } + *file = ga.ga_data; + *num_file = ga.ga_len; + + vim_free(buf); + vim_free(pat); + if (mustfree) + vim_free(path); + return ret; + } + *file = (char_u **)""; *num_file = 0; if (xp->xp_context == EXPAND_HELP) diff --git a/src/feature.h b/src/feature.h index 34b673d5d7..7231b96bf7 100644 --- a/src/feature.h +++ b/src/feature.h @@ -609,6 +609,10 @@ # define FEAT_MBYTE #endif +/* Define this if you want to use 16 bit Unicode only, reduces memory used for + * the screen structures. */ +/* #define UNICODE16 */ + /* * +multi_byte_ime Win32 IME input method. Requires +multi_byte. * Only for far-east Windows, so IME can be used to input @@ -732,7 +736,7 @@ /* * GUI tabline */ -#if defined(FEAT_GUI_GTK) && defined(HAVE_GTK2) && defined(FEAT_WINDOWS) +#if defined(FEAT_GUI_GTK) && defined(FEAT_WINDOWS) # define FEAT_GUI_TABLINE #endif diff --git a/src/fileio.c b/src/fileio.c index 508de0bc12..8333f73b24 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -12,11 +12,11 @@ */ #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) -# include /* for lseek(), must be before vim.h */ +# include "vimio.h" /* for lseek(), must be before vim.h */ #endif #if defined __EMX__ -# include /* for mktemp(), CJW 1997-12-03 */ +# include "vimio.h" /* for mktemp(), CJW 1997-12-03 */ #endif #include "vim.h" diff --git a/src/globals.h b/src/globals.h index 9e0f3e4f84..d31109565a 100644 --- a/src/globals.h +++ b/src/globals.h @@ -53,8 +53,9 @@ EXTERN char_u *LineWraps INIT(= NULL); /* line wraps to next line */ * Note: These three are only allocated when enc_utf8 is set! */ EXTERN u8char_T *ScreenLinesUC INIT(= NULL); /* decoded UTF-8 characters */ -EXTERN u8char_T *ScreenLinesC1 INIT(= NULL); /* first composing char */ -EXTERN u8char_T *ScreenLinesC2 INIT(= NULL); /* second composing char */ +EXTERN u8char_T *ScreenLinesC[MAX_MCO]; /* composing characters */ +EXTERN int Screen_mco INIT(= 0); /* value of p_mco used when + allocating ScreenLinesC[] */ /* Only used for euc-jp: Second byte of a character that starts with 0x8e. * These are single-width. */ diff --git a/src/gui.h b/src/gui.h index 90047c38fc..6544244dde 100644 --- a/src/gui.h +++ b/src/gui.h @@ -391,6 +391,8 @@ typedef struct Gui PangoContext *text_context; /* the context used for all text */ PangoFont *ascii_font; /* cached font for ASCII strings */ PangoGlyphString *ascii_glyphs; /* cached code point -> glyph map */ +# endif +# ifdef FEAT_GUI_TABLINE GtkWidget *tabline; /* tab pages line handle */ # endif diff --git a/src/gui_beval.c b/src/gui_beval.c index 0bcd023fe0..b79884ee85 100644 --- a/src/gui_beval.c +++ b/src/gui_beval.c @@ -61,7 +61,7 @@ general_beval_cb(beval, state) ++textlock; vim_free(result); - result = eval_to_string(p_bexpr, NULL); + result = eval_to_string(p_bexpr, NULL, TRUE); if (use_sandbox) --sandbox; diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 04f1372ec2..058e90c961 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3187,6 +3187,10 @@ on_select_tab( } } +#ifndef HAVE_GTK2 +static int showing_tabline = 0; +#endif + /* * Show or hide the tabline. */ @@ -3196,11 +3200,19 @@ gui_mch_show_tabline(int showit) if (gui.tabline == NULL) return; +#ifdef HAVE_GTK2 + /* gtk_notebook_get_show_tabs does not exist in gtk+-1.2.10 */ if (!showit != !gtk_notebook_get_show_tabs(GTK_NOTEBOOK(gui.tabline))) +#else + if (!showit != !showing_tabline) +#endif { /* Note: this may cause a resize event */ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gui.tabline), showit); update_window_manager_hints(); +#ifndef HAVE_GTK2 + showing_tabline = showit; +#endif } } @@ -3211,7 +3223,13 @@ gui_mch_show_tabline(int showit) gui_mch_showing_tabline(void) { return gui.tabline != NULL - && gtk_notebook_get_show_tabs(GTK_NOTEBOOK(gui.tabline)); +#ifdef HAVE_GTK2 + /* gtk_notebook_get_show_tabs does not exist in gtk+-1.2.10 */ + && gtk_notebook_get_show_tabs(GTK_NOTEBOOK(gui.tabline)) +#else + && showing_tabline +#endif + ; } /* @@ -4456,7 +4474,9 @@ gui_mch_font_dialog(char_u *oldval) if (gui.fontname != NULL) { - fontname = vim_strsave(gui.fontname); + /* Apparently some font names include a comma, need to escape that, + * because in 'guifont' it separates names. */ + fontname = vim_strsave_escaped(gui.fontname, (char_u *)","); g_free(gui.fontname); gui.fontname = NULL; } @@ -4526,11 +4546,19 @@ gui_mch_font_dialog(char_u *oldval) GTK_FONT_SELECTION_DIALOG(dialog)); if (name != NULL) { + char_u *p; + + /* Apparently some font names include a comma, need to escape + * that, because in 'guifont' it separates names. */ + p = vim_strsave_escaped((char_u *)name, (char_u *)","); + g_free(name); if (input_conv.vc_type != CONV_NONE) - fontname = string_convert(&input_conv, (char_u *)name, NULL); + { + fontname = string_convert(&input_conv, p, NULL); + vim_free(p); + } else - fontname = vim_strsave((char_u *)name); - g_free(name); + fontname = p; } } diff --git a/src/gui_w32.c b/src/gui_w32.c index 234afe1f36..46ca5468de 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -2025,12 +2025,26 @@ gui_mch_draw_string( int clen; /* string length up to composing char */ int cells; /* cell width of string up to composing char */ int cw; /* width of current cell */ + int c; + int xtra; cells = 0; for (clen = 0; i < len; ) { - unicodebuf[clen] = utf_ptr2char(text + i); - cw = utf_char2cells(unicodebuf[clen]); + c = utf_ptr2char(text + i); + if (c >= 0x10000) + { + /* Turn into UTF-16 encoding. */ + unicodebuf[clen] = ((c - 0x10000) >> 10) + 0xD800; + unicodebuf[clen + 1] = ((c - 0x10000) & 0x3ff) + 0xDC00; + xtra = 1; + } + else + { + unicodebuf[clen] = c; + xtra = 0; + } + cw = utf_char2cells(c); if (cw > 2) /* don't use 4 for unprintable char */ cw = 1; if (unicodepdy != NULL) @@ -2039,10 +2053,12 @@ gui_mch_draw_string( * when the font uses different widths (e.g., bold character * is wider). */ unicodepdy[clen] = cw * gui.char_width; + if (xtra == 1) + unicodepdy[clen + 1] = cw * gui.char_width; } cells += cw; i += utfc_ptr2len_len(text + i, len - i); - ++clen; + clen += xtra + 1; } ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row), foptions, pcliprect, unicodebuf, clen, unicodepdy); diff --git a/src/if_cscope.c b/src/if_cscope.c index f921965705..aef48d064a 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -22,7 +22,7 @@ # include #else /* not UNIX, must be WIN32 */ -# include +# include "vimio.h" # include # include # define STDIN_FILENO 0 diff --git a/src/if_mzsch.c b/src/if_mzsch.c index 9eb524a6af..6a34ad34a2 100644 --- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -1249,7 +1249,7 @@ vim_eval(void *data, int argc, Scheme_Object **argv) expr = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0)); - str = (char *)eval_to_string((char_u *)expr, NULL); + str = (char *)eval_to_string((char_u *)expr, NULL, TRUE); if (str == NULL) raise_vim_exn(_("invalid expression")); diff --git a/src/if_ole.cpp b/src/if_ole.cpp index 544ea16fb1..59c786a423 100644 --- a/src/if_ole.cpp +++ b/src/if_ole.cpp @@ -368,7 +368,7 @@ CVim::Eval(BSTR expr, BSTR *result) /* Evaluate the expression */ ++emsg_skip; - str = (char *)eval_to_string((char_u *)buffer, NULL); + str = (char *)eval_to_string((char_u *)buffer, NULL, TRUE); --emsg_skip; vim_free(buffer); if (str == NULL) diff --git a/src/if_perl.xs b/src/if_perl.xs index 0f1dcd27f6..14cb86f2cc 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -427,9 +427,10 @@ msg_split(s, attr) * work properly. */ char_u * -eval_to_string(arg, nextcmd) +eval_to_string(arg, nextcmd, dolist) char_u *arg; char_u **nextcmd; + int dolist; { return NULL; } @@ -827,7 +828,7 @@ Eval(str) PREINIT: char_u *value; PPCODE: - value = eval_to_string((char_u *)str, (char_u**)0); + value = eval_to_string((char_u *)str, (char_u **)0, TRUE); if (value == NULL) { XPUSHs(sv_2mortal(newSViv(0))); diff --git a/src/if_ruby.c b/src/if_ruby.c index bacd6c72b8..6e9f95d652 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -519,7 +519,7 @@ static VALUE vim_command(VALUE self, VALUE str) static VALUE vim_evaluate(VALUE self, VALUE str) { #ifdef FEAT_EVAL - char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL); + char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL, TRUE); if (value) { diff --git a/src/if_sniff.c b/src/if_sniff.c index 1485d5e518..ab7a3f056e 100644 --- a/src/if_sniff.c +++ b/src/if_sniff.c @@ -12,7 +12,7 @@ #ifdef WIN32 # include # include -# include +# include "vimio.h" # include # include # include diff --git a/src/if_tcl.c b/src/if_tcl.c index 30f7d9857e..fe43d23ceb 100644 --- a/src/if_tcl.c +++ b/src/if_tcl.c @@ -1407,7 +1407,7 @@ tclvimexpr(interp, objc, objv, objn) #ifdef FEAT_EVAL expr = Tcl_GetStringFromObj(objv[objn], NULL); - str = (char *)eval_to_string((char_u *)expr, NULL); + str = (char *)eval_to_string((char_u *)expr, NULL, TRUE); if (str == NULL) Tcl_SetResult(interp, _("invalid expression"), TCL_STATIC); else diff --git a/src/main.c b/src/main.c index 1a16f443c2..bd31e50b0c 100644 --- a/src/main.c +++ b/src/main.c @@ -8,7 +8,7 @@ */ #if defined(MSDOS) || defined(WIN32) || defined(_WIN64) -# include /* for close() and dup() */ +# include "vimio.h" /* for close() and dup() */ #endif #define EXTERN @@ -3602,7 +3602,7 @@ eval_client_expr_to_string(expr) redir_off = 0; ++emsg_skip; - res = eval_to_string(expr, NULL); + res = eval_to_string(expr, NULL, TRUE); debug_break_level = save_dbl; redir_off = save_ro; diff --git a/src/mbyte.c b/src/mbyte.c index 062d5842fb..4cd7e96fa9 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -1486,55 +1486,59 @@ utf_composinglike(p1, p2) #endif /* - * Convert a UTF-8 byte string to a wide chararacter. Also get up to two + * Convert a UTF-8 byte string to a wide chararacter. Also get up to MAX_MCO * composing characters. */ int -utfc_ptr2char(p, p1, p2) +utfc_ptr2char(p, pcc) char_u *p; - int *p1; /* return: first composing char or 0 */ - int *p2; /* return: second composing char or 0 */ + int *pcc; /* return: composing chars, last one is 0 */ { int len; int c; int cc; + int i = 0; c = utf_ptr2char(p); len = utf_ptr2len(p); + /* Only accept a composing char when the first char isn't illegal. */ if ((len > 1 || *p < 0x80) && p[len] >= 0x80 && UTF_COMPOSINGLIKE(p, p + len)) { - *p1 = utf_ptr2char(p + len); - len += utf_ptr2len(p + len); - if (p[len] >= 0x80 && utf_iscomposing(cc = utf_ptr2char(p + len))) - *p2 = cc; - else - *p2 = 0; - } - else - { - *p1 = 0; - *p2 = 0; + cc = utf_ptr2char(p + len); + for (;;) + { + pcc[i++] = cc; + if (i == MAX_MCO) + break; + len += utf_ptr2len(p + len); + if (p[len] < 0x80 || !utf_iscomposing(cc = utf_ptr2char(p + len))) + break; + } } + + if (i < MAX_MCO) /* last composing char must be 0 */ + pcc[i] = 0; + return c; } /* - * Convert a UTF-8 byte string to a wide chararacter. Also get up to two + * Convert a UTF-8 byte string to a wide chararacter. Also get up to MAX_MCO * composing characters. Use no more than p[maxlen]. */ int -utfc_ptr2char_len(p, p1, p2, maxlen) +utfc_ptr2char_len(p, pcc, maxlen) char_u *p; - int *p1; /* return: first composing char or 0 */ - int *p2; /* return: second composing char or 0 */ + int *pcc; /* return: composing chars, last one is 0 */ int maxlen; { int len; int c; int cc; + int i = 0; c = utf_ptr2char(p); len = utf_ptr2len_len(p, maxlen); @@ -1544,20 +1548,23 @@ utfc_ptr2char_len(p, p1, p2, maxlen) && p[len] >= 0x80 && UTF_COMPOSINGLIKE(p, p + len)) { - *p1 = utf_ptr2char(p + len); - len += utf_ptr2len_len(p + len, maxlen - len); - if (len < maxlen - && p[len] >= 0x80 - && utf_iscomposing(cc = utf_ptr2char(p + len))) - *p2 = cc; - else - *p2 = 0; - } - else - { - *p1 = 0; - *p2 = 0; + cc = utf_ptr2char(p + len); + for (;;) + { + pcc[i++] = cc; + if (i == MAX_MCO) + break; + len += utf_ptr2len_len(p + len, maxlen - len); + if (len >= maxlen + || p[len] < 0x80 + || !utf_iscomposing(cc = utf_ptr2char(p + len))) + break; + } } + + if (i < MAX_MCO) /* last composing char must be 0 */ + pcc[i] = 0; + return c; } @@ -1573,13 +1580,14 @@ utfc_char2bytes(off, buf) char_u *buf; { int len; + int i; len = utf_char2bytes(ScreenLinesUC[off], buf); - if (ScreenLinesC1[off] != 0) + for (i = 0; i < Screen_mco; ++i) { - len += utf_char2bytes(ScreenLinesC1[off], buf + len); - if (ScreenLinesC2[off] != 0) - len += utf_char2bytes(ScreenLinesC2[off], buf + len); + if (ScreenLinesC[i][off] == 0) + break; + len += utf_char2bytes(ScreenLinesC[i][off], buf + len); } return len; } diff --git a/src/memfile.c b/src/memfile.c index bac84fed94..aeeb8cba91 100644 --- a/src/memfile.c +++ b/src/memfile.c @@ -33,7 +33,7 @@ */ #if defined MSDOS || defined(WIN32) || defined(_WIN64) -# include /* for lseek(), must be before vim.h */ +# include "vimio.h" /* for lseek(), must be before vim.h */ #endif #include "vim.h" diff --git a/src/memline.c b/src/memline.c index 451ace35a7..b876261b0d 100644 --- a/src/memline.c +++ b/src/memline.c @@ -43,7 +43,7 @@ */ #if defined(MSDOS) || defined(WIN32) || defined(_WIN64) -# include +# include "vimio.h" #endif #include "vim.h" diff --git a/src/message.c b/src/message.c index 0cba2ccba0..c3acc409a6 100644 --- a/src/message.c +++ b/src/message.c @@ -293,10 +293,12 @@ trunc_string(s, buf, room) else if (enc_utf8) { /* For UTF-8 we can go backwards easily. */ - i = (int)STRLEN(s); + half = i = (int)STRLEN(s); for (;;) { - half = i - (*mb_head_off)(s, s + i - 1) - 1; + do + half = half - (*mb_head_off)(s, s + half - 1) - 1; + while (utf_iscomposing(utf_ptr2char(s + half)) && half > 0); n = ptr2cells(s + half); if (len + n > room) break; @@ -1723,7 +1725,7 @@ msg_puts_long_attr(longstr, attr) char_u *longstr; int attr; { - msg_puts_long_len_attr(longstr, (int)strlen((char *)longstr), attr); + msg_puts_long_len_attr(longstr, (int)STRLEN(longstr), attr); } void diff --git a/src/misc1.c b/src/misc1.c index c9deb85fe8..f95d93d49b 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -2177,11 +2177,11 @@ del_bytes(count, fixpos, use_delcombine) if (p_deco && use_delcombine && enc_utf8 && utfc_ptr2len(oldp + col) >= count) { - int c1, c2; + int cc[MAX_MCO]; int n; - (void)utfc_ptr2char(oldp + col, &c1, &c2); - if (c1 != NUL) + (void)utfc_ptr2char(oldp + col, cc); + if (cc[0] != NUL) { /* Find the last composing char, there can be several. */ n = col; @@ -8056,6 +8056,7 @@ fast_breakcheck() /* * Expand wildcards. Calls gen_expand_wildcards() and removes files matching * 'wildignore'. + * Returns OK or FAIL. */ int expand_wildcards(num_pat, pat, num_file, file, flags) @@ -8898,7 +8899,7 @@ expand_backtick(gap, pat, flags) #ifdef FEAT_EVAL if (*cmd == '=') /* `={expr}`: Expand expression */ - buffer = eval_to_string(cmd + 1, &p); + buffer = eval_to_string(cmd + 1, &p, TRUE); else #endif buffer = get_cmd_output(cmd, NULL, diff --git a/src/msvcsetup.bat b/src/msvcsetup.bat new file mode 100644 index 0000000000..e57702049c --- /dev/null +++ b/src/msvcsetup.bat @@ -0,0 +1,12 @@ +rem To be used on MS-Windows when using the Visual C++ Toolkit 2003 +rem See INSTALLpc.txt for information. + +set PATH=%SystemRoot%\Microsoft.NET\Framework\v1.1.4322;%PATH% +call "%VCToolkitInstallDir%vcvars32.bat" +set MSVCVer=7.1 + +rem The platform SDK can be installed elsewhere, adjust the path. +call "%ProgramFiles%\Microsoft Platform SDK\SetEnv.Cmd" +rem call "e:\Microsoft Platform SDK\SetEnv.Cmd" + +set LIB=%ProgramFiles%\Microsoft Visual Studio .NET 2003\Vc7\lib;%LIB% diff --git a/src/netbeans.c b/src/netbeans.c index eb9146bba8..c28462493b 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -26,7 +26,7 @@ # ifdef DEBUG # include /* for _T definition for TRACEn macros */ # endif -# include +# include "vimio.h" /* WinSock API is separated from C API, thus we can't use read(), write(), * errno... */ # define sock_errno WSAGetLastError() diff --git a/src/normal.c b/src/normal.c index 73812568e2..c59b01f27c 100644 --- a/src/normal.c +++ b/src/normal.c @@ -5691,9 +5691,9 @@ nv_right(cap) || (PAST_LINE && *ml_get_cursor() == NUL)) { /* - * wraps to next line if 'whichwrap' bit 1 set. - * 'l' wraps to next line if 'whichwrap' bit 2 set. - * CURS_RIGHT wraps to next line if 'whichwrap' bit 3 set + * wraps to next line if 'whichwrap' has 's'. + * 'l' wraps to next line if 'whichwrap' has 'l'. + * CURS_RIGHT wraps to next line if 'whichwrap' has '>'. */ if ( ((cap->cmdchar == ' ' && vim_strchr(p_ww, 's') != NULL) @@ -5706,8 +5706,7 @@ nv_right(cap) /* When deleting we also count the NL as a character. * Set cap->oap->inclusive when last char in the line is * included, move to next line after that */ - if ( (cap->oap->op_type == OP_DELETE - || cap->oap->op_type == OP_CHANGE) + if ( cap->oap->op_type != OP_NOP && !cap->oap->inclusive && !lineempty(curwin->w_cursor.lnum)) cap->oap->inclusive = TRUE; diff --git a/src/ops.c b/src/ops.c index 9695d9da3a..82a7595580 100644 --- a/src/ops.c +++ b/src/ops.c @@ -780,7 +780,7 @@ get_expr_line() if (expr_copy == NULL) return NULL; - rv = eval_to_string(expr_copy, NULL); + rv = eval_to_string(expr_copy, NULL, TRUE); vim_free(expr_copy); return rv; } diff --git a/src/option.c b/src/option.c index 23b6be81e8..5c957e5e95 100644 --- a/src/option.c +++ b/src/option.c @@ -414,6 +414,8 @@ struct vimoption #define P_NFNAME 0x200000L/* only normal file name chars allowed */ #define P_INSECURE 0x400000L/* option was set from a modeline */ +#define ISK_LATIN1 (char_u *)"@,48-57,_,192-255" + /* * options[] is initialized here. * The order of the options MUST be alphabetic for ":set all" and findoption(). @@ -848,8 +850,7 @@ static struct vimoption #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L} - }, + {(char_u *)FALSE, (char_u *)0L}}, {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_INS_EXPAND (char_u *)&p_dict, PV_DICT, @@ -1423,7 +1424,7 @@ static struct vimoption # if defined(MSDOS) || defined(MSWIN) || defined(OS2) (char_u *)"@,48-57,_,128-167,224-235" # else - (char_u *)"@,48-57,_,192-255" + ISK_LATIN1 # endif #endif }}, @@ -1602,6 +1603,13 @@ static struct vimoption {"matchtime", "mat", P_NUM|P_VI_DEF, (char_u *)&p_mat, PV_NONE, {(char_u *)5L, (char_u *)0L}}, + {"maxcombine", "mco", P_NUM|P_VI_DEF, +#ifdef FEAT_MBYTE + (char_u *)&p_mco, PV_NONE, +#else + (char_u *)NULL, PV_NONE, +#endif + {(char_u *)2, (char_u *)0L}}, {"maxfuncdepth", "mfd", P_NUM|P_VI_DEF, #ifdef FEAT_EVAL (char_u *)&p_mfd, PV_NONE, @@ -3198,9 +3206,17 @@ set_init_1() # endif ) { - /* Adjust the default for 'isprint' to match latin1. */ + /* Adjust the defa