diff options
-rw-r--r-- | .appveyor.yml | 1 | ||||
-rw-r--r-- | READMEdir/README_os390.txt | 2 | ||||
-rw-r--r-- | runtime/doc/starting.txt | 2 | ||||
-rw-r--r-- | runtime/doc/testing.txt | 2 | ||||
-rw-r--r-- | runtime/doc/usr_90.txt | 5 | ||||
-rw-r--r-- | runtime/doc/various.txt | 4 | ||||
-rw-r--r-- | src/bigvim.bat | 2 | ||||
-rw-r--r-- | src/bigvim64.bat | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
9 files changed, 10 insertions, 12 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 2d7383b971..35da109210 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -29,7 +29,6 @@ environment: # disabled # - FEATURE: TINY # - FEATURE: NORMAL -# - FEATURE: BIG matrix: fast_finish: true diff --git a/READMEdir/README_os390.txt b/READMEdir/README_os390.txt index 87db0b4ec4..ecbe8cadc9 100644 --- a/READMEdir/README_os390.txt +++ b/READMEdir/README_os390.txt @@ -46,7 +46,7 @@ Change to the vim directory and do: $ export CC=cc $ export _CC_CCMODE=1 - $./configure --with-features=big --without-x --enable-gui=no + $./configure --with-features=normal --without-x --enable-gui=no $ cd src $ make diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 6bc4513476..58b8edcd35 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1704,6 +1704,6 @@ most of the information will be restored). If you get the |press-enter| prompt you can press "q" and still get the prompt to enter a file number. Use ! to abandon a modified buffer. |abandon| - {not when compiled with tiny or small features} + {not when compiled with tiny features} vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt index 362f2b9714..2d78c0ec12 100644 --- a/runtime/doc/testing.txt +++ b/runtime/doc/testing.txt @@ -21,7 +21,7 @@ Vim can be tested after building it, usually with "make test". The tests are located in the directory "src/testdir". There are two types of tests added over time: - test20.in oldest, only for tiny and small builds + test20.in oldest, only for tiny builds test_something.vim new style tests *new-style-testing* diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index 060e0d58da..781a0ffdff 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -173,9 +173,8 @@ enabled from the Makefile. --prefix={directory} Top directory where to install Vim. - --with-features=tiny Compile with many features disabled. - --with-features=small Compile with some features disabled. - --with-features=big Compile with more features enabled. + --with-features=tiny Compile with some features disabled. + --with-features=normal Compile with more features enabled. --with-features=huge Compile with most features enabled. See |+feature-list| for which feature is enabled in which case. diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index b2b7903935..4ee889003d 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -320,15 +320,13 @@ g8 Print the hex values of the bytes used in the The first column shows the smallest version in which they are included: T tiny (always) - S small N normal - B big H huge m manually enabled or depends on other features - never, feature was removed (none) system dependent Thus if a feature is marked with "N", it is included - in the normal, big and huge versions of Vim. + in the normal and huge versions of Vim. *+feature-list* *+acl* |ACL| support included diff --git a/src/bigvim.bat b/src/bigvim.bat index e82eabddd0..a092547f11 100644 --- a/src/bigvim.bat +++ b/src/bigvim.bat @@ -1,4 +1,4 @@ -:: command to build big Vim with OLE, Lua, Perl, Python, Racket, Ruby and Tcl +:: command to build huge Vim with OLE, Lua, Perl, Python, Racket, Ruby and Tcl SET VCDIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\" SET TOOLDIR=E:\ %VCDIR%nmake -f Make_mvc.mak GUI=yes OLE=yes LUA=%TOOLDIR%lua53 DYNAMIC_LUA=yes LUA_VER=53 PERL=%TOOLDIR%perl524 DYNAMIC_PERL=yes PERL_VER=524 PYTHON=%TOOLDIR%python27 DYNAMIC_PYTHON=yes PYTHON_VER=27 PYTHON3=%TOOLDIR%python36 DYNAMIC_PYTHON3=yes PYTHON3_VER=36 MZSCHEME=%TOOLDIR%Racket DYNAMIC_MZSCHEME=yes MZSCHEME_VER=3m_a36fs8 RUBY=%TOOLDIR%ruby24 DYNAMIC_RUBY=yes RUBY_VER=24 RUBY_API_VER_LONG=2.4.0 RUBY_MSVCRT_NAME=msvcrt TCL=%TOOLDIR%ActiveTcl TCL_VER=86 TCL_VER_LONG=8.6 DYNAMIC_TCL=yes TCL_DLL=tcl86t.dll %1 IME=yes CSCOPE=yes DIRECTX=yes diff --git a/src/bigvim64.bat b/src/bigvim64.bat index 8d5fba0f66..7025374f91 100644 --- a/src/bigvim64.bat +++ b/src/bigvim64.bat @@ -1,4 +1,4 @@ -:: command to build big Vim 64 bit with OLE, Perl and Python. +:: command to build huge Vim 64 bit with OLE, Perl and Python. :: First run: %VCDIR%\vcvarsall.bat x86_amd64 :: Ruby and Tcl are excluded, doesn't seem to work. SET VCDIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\" diff --git a/src/version.c b/src/version.c index 7c5f3c4fe0..057cae580a 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1994, +/**/ 1993, /**/ 1992, |