# HG changeset patch # User Christian Brabandt # Date 1458400504 -3600 # Node ID 58e749232bd741b4c54748d090e71935796a0a41 # Parent eec3ad6e618961882a6119afa74cf5c84fa8ce8b commit https://github.com/vim/vim/commit/818c9e7edfce339eff7cb357f2ec29a72afd1977 Author: Bram Moolenaar Date: Sat Mar 19 16:09:42 2016 +0100 patch 7.4.1601 Problem: README files take a lot of space in the top directory. Solution: Move most of them to "READMEdir". diff --git a/Filelist b/Filelist --- a/Filelist +++ b/Filelist @@ -692,6 +692,28 @@ EXTRA = \ src/tee/Make_mvc.mak \ src/tee/tee.c \ +# files in READMEdir that are included from the top dir +IN_README_DIR = \ + README.txt.info \ + README_ami.txt \ + README_ami.txt.info \ + README_amibin.txt \ + README_amibin.txt.info \ + README_amisrc.txt \ + README_amisrc.txt.info \ + README_bindos.txt \ + README_dos.txt \ + README_extra.txt \ + README_mac.txt \ + README_ole.txt \ + README_os2.txt \ + README_os390.txt \ + README_src.txt \ + README_srcdos.txt \ + README_unix.txt \ + README_vms.txt \ + README_w32s.txt \ + # generic language files LANG_GEN = \ runtime/doc/*-de.1 \ diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -213,24 +213,13 @@ MINOR = 4 # > bigvim64.bat # # -# OBSOLETE systems: You can build this if you have an appropriate system. +# OBSOLETE systems: You can build these if you have an appropriate system. # -# 16 bit DOS version: (doesn't build anywhere) -# - Set environment for compiling with Borland C++ 3.1. -# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that -# case set environment for compiling with Borland C++ 4.0 and do -# "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe"). -# NOTE: this currently fails because Vim is too big. -# - "make test" and check the output. -# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and -# "uninstald16.exe". +# 16 bit DOS version: You need to get a very old version of Vim, for several +# years even the tiny build is too big to fit in DOS memory. # -# 32 bit DOS version: (requires Windows XP or earlier) -# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak". -# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for -# "ALL DONE". -# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and -# "uninstald32.exe". +# 32 bit DOS version: Support was removed in 7.4.1399. When syncing to before +# that it probably won't build. # # Win32s GUI version: (requires a very old compiler) # - Set environment for Visual C++ 4.1 (requires a new console window): @@ -242,12 +231,9 @@ MINOR = 4 # - Rename "uninstal.exe" to "uninstalw32.exe" # - The produced uninstalw32.exe and vimrun.exe are used. # -# OS/2: (requires an OS/2 system) -# - Unpack the Unix archive. -# - "make -f Make_os2.mak". -# - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy -# them to here. -# - "make os2bin". +# OS/2 support was removed in patch 7.4.1008. If you want to give it a try +# sync to before that and check the old version of this Makefile for +# instructions. VIMVER = vim-$(MAJOR).$(MINOR) VERSION = $(MAJOR)$(MINOR) @@ -269,9 +255,13 @@ dist: mkdir dist # Clean up some files to avoid they are included. +# Copy README files to the top directory. prepare: if test -f runtime/doc/uganda.nsis.txt; then \ rm runtime/doc/uganda.nsis.txt; fi + for name in $(IN_README_DIR); do \ + cp READMEdir/"$$name" .; \ + done # For the zip files we need to create a file with the comment line dist/comment: @@ -336,6 +326,7 @@ unixall: dist prepare $(EXTRA) \ $(LANG_SRC) \ | (cd dist/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) # Need to use a "distclean" config.mk file # Note: this file is not included in the repository to avoid problems, but it's # OK to put it in the archive. @@ -372,6 +363,7 @@ amirt: dist prepare $(RT_NO_UNIX) \ $(RT_AMI_DOS) \ | (cd dist/Vim/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) mv dist/Vim/$(VIMRTDIR)/vimdir.info dist/Vim.info mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info mv dist/Vim/$(VIMRTDIR)/runtime/* dist/Vim/$(VIMRTDIR) @@ -392,6 +384,7 @@ amibin: dist prepare Vim \ Xxd \ | (cd dist/Vim/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) mv dist/Vim/$(VIMRTDIR)/vimdir.info dist/Vim.info mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info cd dist && tar cf vim$(VERSION)bin.tar Vim Vim.info @@ -410,6 +403,7 @@ amisrc: dist prepare $(SRC_AMI) \ $(SRC_AMI_DOS) \ | (cd dist/Vim/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) mv dist/Vim/$(VIMRTDIR)/vimdir.info dist/Vim.info mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info cd dist && tar cf vim$(VERSION)src.tar Vim Vim.info @@ -483,6 +477,7 @@ dosrt_files: dist prepare no_title.vim $(RT_DOS_BIN) \ $(LANG_GEN_BIN) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR) rmdir dist/vim/$(VIMRTDIR)/runtime # Add the message translations. Trick: skip ja.mo and use ja.sjis.mo instead. @@ -517,6 +512,7 @@ dosbin_gvim: dist no_title.vim dist/$(CO tar cf - \ $(BIN_DOS) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) cp gvim.exe dist/vim/$(VIMRTDIR)/gvim.exe cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe diff --git a/README.txt.info b/README.txt.info deleted file mode 100755 index e7fa114944bddd6e0c2855070df4aa04d7e020d3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 GIT binary patch literal 0 Hc$@ - -Unpack the tar file on z/OS with - pax -o from=ISO8859-1,to=IBM-1047 -rf vim.tar - -Note: The Vim source contains a few bitmaps etc which will be destroyed by -this command, but these files are not needed on zOS (at least not for the -console version). - - -Compiling: -========== - -Vim can be compiled with or without GUI support. For 7.4 only the compilation -without GUI was tested. Below is a section about compiling with X11 but this -is from an earlier version of Vim. - -Console only: -------------- - -If you build VIM without X11 support, compiling and building is nearly -straightforward. - -Change to the vim directory and do: - - # Don't use c89! - # Allow intermixing of compiler options and files. - - $ export CC=cc - $ export _CC_CCMODE=1 - $./configure --with-features=big --without-x --enable-gui=no - $ cd src - $ make - - There may be warnings: - - include files not found (libc, sys/param.h, ...) - - Redeclaration of ... differs from ... - -- just ignore them. - - $ make test - - This will produce lots of garbage on your screen (including error - messages). Don't worry. - - If the test stops at one point in vim (might happen in test 11), just - press :q! - - Expected test failures: - 11: If you don't have gzip installed - 24: test of backslash sequences in regexp are ASCII dependent - 42: Multibyte is not supported on z/OS - 55: ASCII<->EBCDIC sorting - 57: ASCII<->EBCDIC sorting - 58: Spell checking is not supported with EBCDIC - 71: Blowfish encryption doesn't work - - $ make install - - -With X11: ---------- - -WARNING: This instruction was not tested with Vim 7.4. - -There are two ways for building VIM with X11 support. The first way is simple -and results in a big executable (~13 Mb), the second needs a few additional -steps and results in a much smaller executable (~4.5 Mb). This examples assume -you want Motif. - - The easy way: - $ export CC=cc - $ export _CC_CCMODE=1 - $ ./configure --enable-max-features --enable-gui=motif - $ cd src - $ make - - With this VIM is linked statically with the X11 libraries. - - The smarter way: - Make VIM as described above. Then create a file named 'link.sed' with the - following content (see src/link.390): - - s/-lXext *//g - s/-lXmu *//g - s/-lXm */\/usr\/lib\/Xm.x /g - s/-lX11 */\/usr\/lib\/X11.x /g - s/-lXt *//g - s/-lSM */\/usr\/lib\/SM.x /g - s/-lICE */\/usr\/lib\/ICE.x /g - - Then do: - $ rm vim - $ make - - Now Vim is linked with the X11-DLLs. - - See the Makefile and the file link.sh on how link.sed is used. - - diff --git a/README_src.txt b/README_src.txt deleted file mode 100644 --- a/README_src.txt +++ /dev/null @@ -1,8 +0,0 @@ -README_src.txt for version 7.4 of Vim: Vi IMproved. - -The source archive contains the files needed to compile Vim on Unix systems. -It is packed for Unix systems (NL line separator). - -For more information, see the README.txt file that comes with the runtime -archive (vim-7.4-rt.tar.gz). To be able to run Vim you MUST get the runtime -archive too! diff --git a/README_srcdos.txt b/README_srcdos.txt deleted file mode 100644 --- a/README_srcdos.txt +++ /dev/null @@ -1,12 +0,0 @@ -README_srcdos.txt for version 7.4 of Vim: Vi IMproved. - -See "README.txt" for general information about Vim. -See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. -These files are in the runtime archive (vim74rt.zip). - - -The DOS source archive contains the files needed to compile Vim on MS-DOS or -MS-Windows. It is packed for DOS systems, with CR-LF. It also includes the -VisVim sources. - -See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC. diff --git a/README_unix.txt b/README_unix.txt deleted file mode 100644 --- a/README_unix.txt +++ /dev/null @@ -1,10 +0,0 @@ -README_unix.txt for version 7.4 of Vim: Vi IMproved. - -This file explains the installation of Vim on Unix systems. -See "README.txt" for general information about Vim. - - -When you use the source distribution, "make install" is used to install Vim. -See the "INSTALL" file in the "src" directory. - -If you use a compiled package, follow the instructions for the package. diff --git a/README_vms.txt b/README_vms.txt deleted file mode 100644 --- a/README_vms.txt +++ /dev/null @@ -1,48 +0,0 @@ -README_vms.txt for version 7.4 of Vim: Vi IMproved. - -This file explains the installation of Vim on VMS systems. -See "README.txt" in the runtime archive for information about Vim. - - -Most information can be found in the on-line documentation. Use ":help vms" -inside Vim. Or get the runtime files and read runtime/doc/os_vms.txt to find -out how to install and configure Vim with runtime files etc. - -To compile Vim yourself you need three archives: - vim-X.X-rt.tar.gz runtime files - vim-X.X-src.tar.gz source files - vim-X.X-extra.tar.gz extra source files - -Compilation is recommended, in order to make sure that the correct -libraries are used for your specific system. Read about compiling in -src/INSTALLvms.txt. - -To use the binary version, you need one of these archives: - - vim-XX-exe-ia64-gui.zip IA64 GUI/Motif executables - vim-XX-exe-ia64-gtk.zip IA64 GUI/GTK executables - vim-XX-exe-ia64-term.zip IA64 console executables - vim-XX-exe-axp-gui.zip Alpha GUI/Motif executables - vim-XX-exe-axp-gtk.zip Alpha GUI/GTK executables - vim-XX-exe-axp-term.zip Alpha console executables - vim-XX-exe-vax-gui.zip VAX GUI executables - vim-XX-exe-vax-term.zip VAX console executables - -and of course - vim-XX-runtime.zip runtime files - -The binary archives contain: vim.exe, ctags.exe, xxd.exe files, -but there are also prepared "deploy ready" archives: - -vim-XX-ia64.zip GUI and console executables with runtime and - help files for IA64 systems -vim-XX-axp.zip GUI and console executables with runtime and - help files for Alpha systems -vim-XX-vax.zip GUI and console executables with runtime and - help files for VAX systems - -GTK builds need LIBGTK library installed. - -These executables and up to date patches for OpenVMS system are downloadable -from http://www.polarhome.com/vim/ or ftp://ftp.polarhome.com/pub/vim/ - diff --git a/README_w32s.txt b/README_w32s.txt deleted file mode 100644 --- a/README_w32s.txt +++ /dev/null @@ -1,15 +0,0 @@ -README_w32s.txt for version 7.4 of Vim: Vi IMproved. - -This archive contains the gvim.exe that was specifically compiled for use in -the Win32s subsystem in MS-Windows 3.1 and 3.11. - -Also see the README_bindos.txt, README_dos.txt and README.txt files. - -Be careful not to overwrite the Win32s gvim.exe with the another gvim.exe when -unpacking another binary archive! Check the output of ":version": - Win32s - "MS-Windows 16/32 bit GUI version" - Win32 - "MS-Windows 32 bit GUI version" -Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support" - -For further information, type this inside Vim: - :help win32s diff --git a/READMEdir/README.txt.info b/READMEdir/README.txt.info new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e7fa114944bddd6e0c2855070df4aa04d7e020d3 GIT binary patch literal 582 zc${^RKS)AR6o=1yN;O2bH3iWikCxV~AZeEjd=(KiNDwsyfl%=3U1({w2%5rZD6f%@ z*3w%dXmJw9UPTD6A<+a0^>psNE)`xl{P^yl!~M?NAZQ@g3Irfb)dN1-36>2Ae&yir z()=4RI(yimB`W{FJ7E|A9kipoPvU;YOM6!UHe#tBrCi0&HfLaGv4mz=GV+w-VpK6b zkX(-`{^p8XrebO!nHoq&bQL4pTP)6F1HjT*NTgA7LLbP$syP!`bileOB+Ir-T)2Jp zQj`y&7rH3e#imNTt#S(GxjTf+s1@?506NzBT+;0Yb*}$*K0fX4EIC_&9T3h9J`E$p zO@3wy=QfSLPdJWUo=9irb9BK^>38YuLIs$8k5#@)&Nh9R8c=`i<}A7Pj2&mQgu?mJ z+~hgR1FTDDt+?!6gH;7=3FjVa`&xiEwD2g8A3^M*SXg8)s}wS-(uD)vvt$0LdO KdSq*R4SoPgnG34` diff --git a/READMEdir/README_ami.txt b/READMEdir/README_ami.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_ami.txt @@ -0,0 +1,32 @@ +README_ami.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on Amiga systems. +See README.txt for general information about Vim. + + +Unpack the distributed files in the place where you want to keep them. It is +wise to have a "vim" directory to keep your vimrc file and any other files you +change. The distributed files go into a subdirectory. This way you can +easily upgrade to a new version. For example: + + dh0:editors/vim contains your vimrc and modified files + dh0:editors/vim/vim54 contains the Vim version 5.4 distributed files + dh0:editors/vim/vim55 contains the Vim version 5.5 distributed files + +You would then unpack the archives like this: + + cd dh0:editors + tar xf t:vim60bin.tar + tar xf t:vim60rt.tar + +Set the $VIM environment variable to point to the top directory of your Vim +files. For the above example: + + set VIM=dh0:editors/vim + +Vim version 5.4 will look for your vimrc file in $VIM, and for the runtime +files in $VIM/vim54. See ":help $VIM" for more information. + +Make sure the Vim executable is in your search path. Either copy the Vim +executable to a directory that is in your search path, or (preferred) modify +the search path to include the directory where the Vim executable is. diff --git a/READMEdir/README_ami.txt.info b/READMEdir/README_ami.txt.info new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..912436d6a4305f9995d2ca90691af27202a6fc83 GIT binary patch literal 582 zc${^Rze_?<6vxkdN;O2bH3iY4w6tmk`431|zKWIx38ID|5Dad;3oVTaxrWhDJ|i2e zrAJUfi<3C^Dk69di4Q?SJ)L{6ONAE>Uq1K8;eO8BAZQ@g0|X#S)dN1-3C@KfIKK~n zm*!uG(ZoTA?x_6#?nGe#bkGjdK8d>pH}9SSn242noN@)f+7<`1h!r%VlF`a3F2@zq z1IhJ-;%`fF%TP=WBvS*)h>l|9JB#I6YydEwM?{7^JMxJfm}iHJXahSbWj;)YxODyM z<|ywYFLY6`gH4rYTjeCmb7u&7$SYmt0%)`2nT*p5>RkWroL%bfEV)>PGzjO0H3cKY zP3y=I&TSffpKu&I%}QtPvvt8w`FH8;Koz)oi#2PToK5;LHK6|3%~`Vdj2&mAg2MUH z*sv}s_pmOVweqri4y*>)63#V9E!-4iEt2TPAak+#p5q>D-e$3JCWTAL@pfo zJB-i@3}@UnOw$tjR}+Um2!L@=4=UWwdpYk6z(y?Bl9WsM)#4270+!K?D@N{UE+sY7 z1;w?L=5MaKX=i|}O#bic(H};7PEZ-d~pbOSXaqq(x#KoIe z&!N1Jy-=ZKfeoE@OXmctb1{G{>KCt_FuK<9?4IZbeIEGjeE8JaS#hBP8z7zQd=iF; z8~n(W&Mo@-9_cu8y04sB&<#j_%)KjT0Tp2O9ai}!IotGLYC!$5le1#~8Qacg8Kv`s zxyr97cd(|Mjnblb4ptSgDV?j3oxjb4C148a4N(^c%}efD48rug!jf_+rPw>39!+G^ K%Zau14EzAS91Ms6 diff --git a/READMEdir/README_amisrc.txt b/READMEdir/README_amisrc.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_amisrc.txt @@ -0,0 +1,11 @@ +README_amisrc.txt for version 7.4 of Vim: Vi IMproved. + +See "README.txt" for general information about Vim. +See "README_ami.txt" for installation instructions for the Amiga. +These files are in the runtime archive (vim60rt.tgz). + + +The Amiga source archive contains the files needed to compile Vim on the +Amiga. + +See "src/INSTALLami.txt" for instructions on how to compile Vim on the Amiga. diff --git a/READMEdir/README_amisrc.txt.info b/READMEdir/README_amisrc.txt.info new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..476af9ac02f637cd652286d8a335468a58d51bb9 GIT binary patch literal 582 zc${^R&nrYx6vw~sjj)ihvr-zHX*O2M3}ya-3FRRh3n{T6HAOw%D_e?%twt7jgR#WM z+eq0=7Sk*&<{_zPVVc*JWac>cUKYq*+;5-z<8(gfu?-q{X(jX^i7*-w;*-enCc17H z@Ox!iB|L-h0SH=>A^PAI; zPUa71#}LkS9(}WLjO}krXFKHTf^QC=q_c-IZ0nLL&N4e&+%Om5`t+Z(wr& L^wdmhesLO~s$>hN diff --git a/READMEdir/README_bindos.txt b/READMEdir/README_bindos.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_bindos.txt @@ -0,0 +1,16 @@ +README_bindos.txt for version 7.4 of Vim: Vi IMproved. + +See "README.txt" for general information about Vim. +See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. +These files are in the runtime archive (vim74rt.zip). + + +There are several binary distributions of Vim for the PC. You would normally +pick only one of them, but it's also possible to install several. +These ones are available (the version number may differ): + vim74w32.zip Windows 95/98/NT/etc. console version + gvim74.zip Windows 95/98/NT/etc. GUI version + gvim74ole.zip Windows 95/98/NT/etc. GUI version with OLE + +You MUST also get the runtime archive (vim74rt.zip). +The sources are also available (vim74src.zip). diff --git a/READMEdir/README_dos.txt b/READMEdir/README_dos.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_dos.txt @@ -0,0 +1,154 @@ +README_dos.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on MS-DOS and MS-Windows systems. +See "README.txt" for general information about Vim. + +There are two ways to install Vim: +A. Use the self-installing .exe file. +B. Unpack .zip files and run the install.exe program. + + +A. Using the self-installing .exe +--------------------------------- + +This is mostly self-explaining. Just follow the prompts and make the +selections. A few things to watch out for: + +- When an existing installation is detected, you are offered to first remove + this. The uninstall program is then started while the install program waits + for it to complete. Sometimes the windows overlap each other, which can be + confusing. Be sure the complete the uninstalling before continuing the + installation. Watch the taskbar for uninstall windows. + +- When selecting a directory to install Vim, use the same place where other + versions are located. This makes it easier to find your _vimrc file. For + example "C:\Program Files\vim" or "D:\vim". A name ending in "vim" is + preferred. + +- After selecting the directory where to install Vim, clicking on "Next" will + start the installation. + + +B. Using .zip files +------------------- + +These are the normal steps to install Vim from the .zip archives: + +1. Go to the directory where you want to put the Vim files. Examples: + cd C:\ + cd D:\editors + If you already have a "vim" directory, go to the directory in which it is + located. Check the $VIM setting to see where it points to: + set VIM + For example, if you have + C:\vim\vim54 + do + cd C:\ + Binary and runtime Vim archives are normally unpacked in the same location, + on top of each other. + +2. Unpack the zip archives. This will create a new directory "vim\vim74", + in which all the distributed Vim files are placed. Since the directory + name includes the version number, it is unlikely that you overwrite + existing files. + Examples: + pkunzip -d gvim74.zip + unzip vim74w32.zip + + You need to unpack the runtime archive and at least one of the binary + archives. When using more than one binary version, be careful not to + overwrite one version with the other, the names of the executables + "vim.exe" and "gvim.exe" are the same. + + After you unpacked the files, you can still move the whole directory tree + to another location. That is where they will stay, the install program + won't move or copy the runtime files. + + Only for the 32 bit DOS version on MS-DOS without DPMI support (trying to + run install.exe will produce an error message): Unpack the CSDPMI4B.ZIP + archive and follow the instructions in the documentation. + +3. Change to the new directory: + cd vim\vim74 + Run the "install.exe" program. It will ask you a number of questions about + how you would like to have your Vim setup. Among these are: + - You can tell it to write a "_vimrc" file with your preferences in the + parent directory. + - It can also install an "Edit with Vim" entry in the Windows Explorer + popup menu. + - You can have it create batch files, so that you can run Vim from the + console or in a shell. You can select one of the directories in your + $PATH. If you skip this, you can add Vim to the search path manually: + The simplest is to add a line to your autoexec.bat. Examples: + set path=%path%;C:\vim\vim74 + set path=%path%;D:\editors\vim\vim74 + - Create entries for Vim on the desktop and in the Start menu. + +That's it! + + +Remarks: + +- If Vim can't find the runtime files, ":help" won't work and the GUI version + won't show a menubar. Then you need to set the $VIM environment variable to + point to the top directory of your Vim files. Example: + set VIM=C:\editors\vim + Vim version 7.4 will look for your vimrc file in $VIM, and for the runtime + files in $VIM/vim74. See ":help $VIM" for more information. + +- To avoid confusion between distributed files of different versions and your + own modified vim scripts, it is recommended to use this directory layout: + ("C:\vim" is used here as the root, replace it with the path you use) + Your own files: + C:\vim\_vimrc Your personal vimrc. + C:\vim\_viminfo Dynamic info for 'viminfo'. + C:\vim\vimfiles\ftplugin\*.vim Filetype plugins + C:\vim\... Other files you made. + Distributed files: + C:\vim\vim74\vim.exe The Vim version 7.4 executable. + C:\vim\vim74\doc\*.txt The version 7.4 documentation files. + C:\vim\vim74\bugreport.vim A Vim version 7.4 script. + C:\vim\vim74\... Other version 7.4 distributed files. + In this case the $VIM environment variable would be set like this: + set VIM=C:\vim + Then $VIMRUNTIME will automatically be set to "$VIM\vim74". Don't add + "vim74" to $VIM, that won't work. + +- You can put your Vim executable anywhere else. If the executable is not + with the other Vim files, you should set $VIM. The simplest is to add a line + to your autoexec.bat. Examples: + set VIM=c:\vim + set VIM=d:\editors\vim + +- If you have told the "install.exe" program to add the "Edit with Vim" menu + entry, you can remove it by running the "uninstal.exe". See + ":help win32-popup-menu". + +- In Windows 95/98/NT you can create a shortcut to Vim. This works for all + DOS and Win32 console versions. For the console version this gives you the + opportunity to set defaults for the Console where Vim runs in. + + 1. On the desktop, click right to get a menu. Select New/Shortcut. + 2. In the dialog, enter Command line: "C:\command.com". Click "Next". + 3. Enter any name. Click "Finish". + The new shortcut will appear on the desktop. + 4. With the mouse pointer on the new shortcut, click right to get a menu. + Select Properties. + 5. In the Program tab, change the "Cmdline" to add "/c" and the name of the + Vim executable. Examples: + C:\command.com /c C:\vim\vim74\vim.exe + C:\command.com /c D:\editors\vim\vim74\vim.exe + 6. Select the font, window size, etc. that you like. If this isn't + possible, select "Advanced" in the Program tab, and deselect "MS-DOS + mode". + 7. Click OK. + + For gvim, you can use a normal shortcut on the desktop, and set the size of + the Window in your $VIM/_gvimrc: + set lines=30 columns=90 + + +For further information, type one of these inside Vim: + :help dos + :help msdos + :help win32 diff --git a/READMEdir/README_extra.txt b/READMEdir/README_extra.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_extra.txt @@ -0,0 +1,51 @@ +README_extra.txt for version 7.4 of Vim: Vi IMproved. + +These extra files of Vim are for special purposes. This README explains what +the files are for. For general information about Vim, see the "README.txt" +file. + + +farsi/* Files for the Farsi (persian) language. If you don't + know what Farsi is, this is not for you. + +src/if_sniff.* Interface to SNiFF. If you don't know what SNiFF is, + this is not for you. + +src/os_amiga.* Files for the Amiga port. + +src/gui_beos.* +src/os_beos.* Files for the BeOS port. + +src/os_msdos.* +src/os_dos.* Files for the MS-DOS port. + +src/gui_mac.* +src/os_mac.* Files for the Mac port. + +src/os_mint.8 Files for the Atari Mint port. + +src/os_os2* Files for the OS/2 port. +src/tee/* Extra program for OS/2. + +src/os_vms* Files for the VMS port. + +src/os_w32* +src/os_win32.* Files for the Win32 port. + +src/gui_w32.* Files for the Win32 GUI. +src/gui_w48.* Files for the Win32 and Win16 GUI. +src/Make_mvc.mak MS Visual C++ makefile for the Win32 GUI. +runtime/rgb.txt File with color definitions for the Win32 GUI. + +src/if_ole.* OLE automation interface, for MS Windows 95 and NT. + +src/VisVim/* Integration of Win32 GUI with MS Visual Developer + Studio. + +src/GvimExt/* DLL for the "Edit with Vim" context menu entry + +nsis/* NSIS script to build the self-installing MS-Windows exe + +runtime/doc/*.man Preprocessed manual pages. + +runtime/macros/file_select.vim Vim script to browse directories (Unix only). diff --git a/READMEdir/README_mac.txt b/READMEdir/README_mac.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_mac.txt @@ -0,0 +1,8 @@ +README_mac.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on Macintosh systems. +See "README.txt" for general information about Vim. + + +Sorry, this text still needs to be written! + diff --git a/READMEdir/README_ole.txt b/READMEdir/README_ole.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_ole.txt @@ -0,0 +1,20 @@ +README_ole.txt for version 7.4 of Vim: Vi IMproved. + +This archive contains gvim.exe with OLE interface and VisVim. +This version of gvim.exe can also load a number of interface dynamically (you +can optionally install the .dll files for each interface). +It is only for MS-Windows 95/98/ME/NT/2000/XP. + +Also see the README_bindos.txt, README_dos.txt and README.txt files. + +Be careful not to overwrite the OLE gvim.exe with the non-OLE gvim.exe when +unpacking another binary archive! Check the output of ":version": + Win32s - "MS-Windows 16/32 bit GUI version" + Win32 - "MS-Windows 32 bit GUI version" +Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support" + +For further information, type this inside Vim: + :help if_ole + +Furthermore, this archive contains VISVIM.DLL. It can be used to integrate +the OLE gvim with Microsoft Visual Developer Studio. See VisVim/README.txt. diff --git a/READMEdir/README_os2.txt b/READMEdir/README_os2.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_os2.txt @@ -0,0 +1,5 @@ +README_os2.txt for version 7.4 of Vim: Vi IMproved. + +This file used to explain the installation of Vim on OS/2 systems. +However, support for OS/2 has been removed in patch 7.4.1008. +See "README.txt" for general information about Vim. diff --git a/READMEdir/README_os390.txt b/READMEdir/README_os390.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_os390.txt @@ -0,0 +1,117 @@ +README_zOS.txt for version 7.4 of Vim: Vi IMproved. + +This readme explains how to build Vim on z/OS. Formerly called OS/390. +See "README.txt" for general information about Vim. + +Most likely there are not many users out there using Vim on z/OS. So chances +are good, that some bugs are still undiscovered. + +Getting the source to z/OS: +========================== + +First get the source code in one big tar file and ftp it a binary to z/OS. If +the tar file is initially compressed with gzip (tar.gz) or bzip2 (tar.bz2) +uncompress it on your PC, as this tools are (most likely) not available on the +mainframe. + +To reduce the size of the tar file you might compress it into a zip file. On +z/OS Unix you might have the command "jar" from java to uncompress a zip. Use: + jar xvf + +Unpack the tar file on z/OS with + pax -o from=ISO8859-1,to=IBM-1047 -rf vim.tar + +Note: The Vim source contains a few bitmaps etc which will be destroyed by +this command, but these files are not needed on zOS (at least not for the +console version). + + +Compiling: +========== + +Vim can be compiled with or without GUI support. For 7.4 only the compilation +without GUI was tested. Below is a section about compiling with X11 but this +is from an earlier version of Vim. + +Console only: +------------- + +If you build VIM without X11 support, compiling and building is nearly +straightforward. + +Change to the vim directory and do: + + # Don't use c89! + # Allow intermixing of compiler options and files. + + $ export CC=cc + $ export _CC_CCMODE=1 + $./configure --with-features=big --without-x --enable-gui=no + $ cd src + $ make + + There may be warnings: + - include files not found (libc, sys/param.h, ...) + - Redeclaration of ... differs from ... + -- just ignore them. + + $ make test + + This will produce lots of garbage on your screen (including error + messages). Don't worry. + + If the test stops at one point in vim (might happen in test 11), just + press :q! + + Expected test failures: + 11: If you don't have gzip installed + 24: test of backslash sequences in regexp are ASCII dependent + 42: Multibyte is not supported on z/OS + 55: ASCII<->EBCDIC sorting + 57: ASCII<->EBCDIC sorting + 58: Spell checking is not supported with EBCDIC + 71: Blowfish encryption doesn't work + + $ make install + + +With X11: +--------- + +WARNING: This instruction was not tested with Vim 7.4. + +There are two ways for building VIM with X11 support. The first way is simple +and results in a big executable (~13 Mb), the second needs a few additional +steps and results in a much smaller executable (~4.5 Mb). This examples assume +you want Motif. + + The easy way: + $ export CC=cc + $ export _CC_CCMODE=1 + $ ./configure --enable-max-features --enable-gui=motif + $ cd src + $ make + + With this VIM is linked statically with the X11 libraries. + + The smarter way: + Make VIM as described above. Then create a file named 'link.sed' with the + following content (see src/link.390): + + s/-lXext *//g + s/-lXmu *//g + s/-lXm */\/usr\/lib\/Xm.x /g + s/-lX11 */\/usr\/lib\/X11.x /g + s/-lXt *//g + s/-lSM */\/usr\/lib\/SM.x /g + s/-lICE */\/usr\/lib\/ICE.x /g + + Then do: + $ rm vim + $ make + + Now Vim is linked with the X11-DLLs. + + See the Makefile and the file link.sh on how link.sed is used. + + diff --git a/READMEdir/README_src.txt b/READMEdir/README_src.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_src.txt @@ -0,0 +1,8 @@ +README_src.txt for version 7.4 of Vim: Vi IMproved. + +The source archive contains the files needed to compile Vim on Unix systems. +It is packed for Unix systems (NL line separator). + +For more information, see the README.txt file that comes with the runtime +archive (vim-7.4-rt.tar.gz). To be able to run Vim you MUST get the runtime +archive too! diff --git a/READMEdir/README_srcdos.txt b/READMEdir/README_srcdos.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_srcdos.txt @@ -0,0 +1,12 @@ +README_srcdos.txt for version 7.4 of Vim: Vi IMproved. + +See "README.txt" for general information about Vim. +See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. +These files are in the runtime archive (vim74rt.zip). + + +The DOS source archive contains the files needed to compile Vim on MS-DOS or +MS-Windows. It is packed for DOS systems, with CR-LF. It also includes the +VisVim sources. + +See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC. diff --git a/READMEdir/README_unix.txt b/READMEdir/README_unix.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_unix.txt @@ -0,0 +1,10 @@ +README_unix.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on Unix systems. +See "README.txt" for general information about Vim. + + +When you use the source distribution, "make install" is used to install Vim. +See the "INSTALL" file in the "src" directory. + +If you use a compiled package, follow the instructions for the package. diff --git a/READMEdir/README_vms.txt b/READMEdir/README_vms.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_vms.txt @@ -0,0 +1,48 @@ +README_vms.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on VMS systems. +See "README.txt" in the runtime archive for information about Vim. + + +Most information can be found in the on-line documentation. Use ":help vms" +inside Vim. Or get the runtime files and read runtime/doc/os_vms.txt to find +out how to install and configure Vim with runtime files etc. + +To compile Vim yourself you need three archives: + vim-X.X-rt.tar.gz runtime files + vim-X.X-src.tar.gz source files + vim-X.X-extra.tar.gz extra source files + +Compilation is recommended, in order to make sure that the correct +libraries are used for your specific system. Read about compiling in +src/INSTALLvms.txt. + +To use the binary version, you need one of these archives: + + vim-XX-exe-ia64-gui.zip IA64 GUI/Motif executables + vim-XX-exe-ia64-gtk.zip IA64 GUI/GTK executables + vim-XX-exe-ia64-term.zip IA64 console executables + vim-XX-exe-axp-gui.zip Alpha GUI/Motif executables + vim-XX-exe-axp-gtk.zip Alpha GUI/GTK executables + vim-XX-exe-axp-term.zip Alpha console executables + vim-XX-exe-vax-gui.zip VAX GUI executables + vim-XX-exe-vax-term.zip VAX console executables + +and of course + vim-XX-runtime.zip runtime files + +The binary archives contain: vim.exe, ctags.exe, xxd.exe files, +but there are also prepared "deploy ready" archives: + +vim-XX-ia64.zip GUI and console executables with runtime and + help files for IA64 systems +vim-XX-axp.zip GUI and console executables with runtime and + help files for Alpha systems +vim-XX-vax.zip GUI and console executables with runtime and + help files for VAX systems + +GTK builds need LIBGTK library installed. + +These executables and up to date patches for OpenVMS system are downloadable +from http://www.polarhome.com/vim/ or ftp://ftp.polarhome.com/pub/vim/ + diff --git a/READMEdir/README_w32s.txt b/READMEdir/README_w32s.txt new file mode 100644 --- /dev/null +++ b/READMEdir/README_w32s.txt @@ -0,0 +1,15 @@ +README_w32s.txt for version 7.4 of Vim: Vi IMproved. + +This archive contains the gvim.exe that was specifically compiled for use in +the Win32s subsystem in MS-Windows 3.1 and 3.11. + +Also see the README_bindos.txt, README_dos.txt and README.txt files. + +Be careful not to overwrite the Win32s gvim.exe with the another gvim.exe when +unpacking another binary archive! Check the output of ":version": + Win32s - "MS-Windows 16/32 bit GUI version" + Win32 - "MS-Windows 32 bit GUI version" +Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support" + +For further information, type this inside Vim: + :help win32s diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1601, +/**/ 1600, /**/ 1599,