vim-6.0am (tag vim-6-0am) --> vim-6.0an (tag vim-6-0an)

vim · Jul 12, 2001 · 4e75fa2 · 4e75fa2
1 parent 6baca95
commit 4e75fa2
Show file tree

Hide file tree

Showing 286 changed files with 15,985 additions and 21,947 deletions.
diff --git a/Contents b/Contents
@@ -9,11 +9,11 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...
 
-		Version 6.0am.  Also runs under UNIX, MSDOS and other systems.
-		vim60amrt.tgz  contains the documentation and syntax files.
-		vim60ambin.tgz contains the normal binaries.
-		vim60ambig.tgz contains a binary with more features.
-		vim60amsrc.tgz contains the sources.
+		Version 6.0an.  Also runs under UNIX, MSDOS and other systems.
+		vim60anrt.tgz  contains the documentation and syntax files.
+		vim60anbin.tgz contains the normal binaries.
+		vim60anbig.tgz contains a binary with more features.
+		vim60ansrc.tgz contains the sources.
 		Author: Bram Moolenaar et al.
 
 

diff --git a/Makefile b/Makefile
@@ -71,7 +71,7 @@ all install uninstall tools config configure proto depend lint tags types test t
 #    Before creating an archive first delete all backup files, *.orig, etc.
 
 MAJOR = 6
-MINOR = 0am
+MINOR = 0an
 
 # CHECKLIST for creating a new version:
 #
@@ -114,38 +114,48 @@ MINOR = 0am
 # - "make test" and check the output.
 # - Rename the executables to "vimd16.exe", "xxdd16.exe", and "installd16.exe".
 # 32 bit DOS version:
-# - Set environment for compiling with DJGPP; "make -f makefile.djg".
-# - "rm testdir/*.out", "make -f makefile.djg test" and check the output.
+# - Set environment for compiling with DJGPP; "make -f Make_djg.mak".
+# - "rm testdir/*.out", "make -f Make_djg.mak test" and check the output.
 # - Rename the executables to "vimd32.exe", "xxdd32.exe", and "installd32.exe".
 # Win32 console version:
 # - Set environment for Visual C++ 5.0: "vcvars32"
-# - "nmake -f makefile.mvc"
-# - "rm testdir/*.out", "nmake -f makefile.mvc test" and check the output.
+# - "nmake -f Make_mvc.mak"
+# - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
 # - Rename the executables to "vimw32.exe", "xxdw32.exe".
 # - Delete vimrun.exe, install.exe and uninstall.exe.
 # Win32 GUI version:
-# - "nmake -f Make_gvc.mak".
+# - "nmake -f Make_mvc.mak GUI=yes.
 # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
 # Win32 GUI with OLE version:
-# - "nmake -f Make_ovc.mak"
+# - "nmake -f Make_mvc.mak GUI=yes OLE=yes
 # - Rename "gvim.exe" to "gvim_ole.exe".
 # Produce Gvimext.dll:
 # - "cd gvimext", "nmake -f Makefile"
-# - Move "gvimext.dll" to here.
+# - Copy "gvimext.dll" to here.
 # Win32s GUI version:
 # - Set environment for Visual C++ 4.1 (requires a new console window)
 # - "vcvars32" (use the path for VC 4.1)
 # - "nmake -f Make_mvc.mak GUI=yes" (use the path for VC 4.1)
 # - Rename "gvim.exe" to "gvim_w32s.exe".
 # - Rename "install.exe" to "installw32.exe"
 # - The produced uninstall.exe and vimrun.exe are used.
-# - Move all the "*.exe" files to here.
+# Create the archives:
+# - Copy all the "*.exe" files to where this Makefile is.
 # - "make dosbin".
 # - "make doslang".
+# NSIS self installing exe:
+# - Run make to update the ".mo" files, then "make doslang".  Unpack the
+#   doslang archive on the PC.
+# - rename gvim_ole.exe to gvim.exe
+# - rename installw32.exe to install.exe
+# - rename xxdw32.exe to xxd/xxd.exe
+# - put gvimext.dll in GvimExt, VisVim.dll in VisVim, OpenWithVim.exe and
+#   SendToVim.exe in OleVim (get them from a binary archive or build them)
+# - go to ../nsis and do "makensis gvim.nsi".
 #
 # OS/2:
 # - Unpack the Unix "src", "extra" and "rt" archives.
-# - "make -f makefile.os2".
+# - "make -f Make_os2.mak".
 # - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe.
 # - "make os2bin".
 
@@ -345,20 +355,21 @@ SRC_DOS_UNIX =	\
 SRC_DOS =	\
 		GvimExt \
 		README_srcdos.txt \
-		src/Make_gvc.mak \
 		src/INSTALLole.txt \
 		src/INSTALLpc.txt \
 		src/Make_bc3.mak \
 		src/Make_bc5.mak \
 		src/Make_cyg.mak \
 		src/Make_djg.mak \
+		src/Make_ivc.mak \
 		src/Make_ming.mak \
 		src/Make_mvc.mak \
 		src/Make_tcc.mak \
 		src/Make_w16.mak \
 		src/dimm.idl \
 		src/dlldata.c \
 		src/dosinst.c \
+		src/dosinst.h \
 		src/glbl_ime.cpp \
 		src/glbl_ime.h \
 		src/gui_w16.c \
@@ -369,7 +380,6 @@ SRC_DOS =	\
 		src/if_ole.cpp \
 		src/if_ole.h \
 		src/if_ole.idl \
-		src/Make_ovc.mak \
 		src/iid_ole.c \
 		src/os_dos.h \
 		src/os_msdos.c \
@@ -405,7 +415,7 @@ SRC_DOS =	\
 		nsis/gvim.nsi \
 		nsis/README.txt \
 		nsis/icons \
-
+		uninstal.txt \
 
 # source files for DOS without CR/LF translation (also in the extra archive)
 SRC_DOS_BIN = 	\
@@ -560,12 +570,9 @@ RT_ALL =	\
 		runtime/doc/vimdiff.1 \
 		runtime/doc/vimtutor.1 \
 		runtime/doc/xxd.1 \
-		runtime/filetype.vim \
 		runtime/ftoff.vim \
 		runtime/gvimrc_example.vim \
 		runtime/macros/README.txt \
-		runtime/macros/diffwin.vim \
-		runtime/macros/hdiffwin.vim \
 		runtime/macros/dvorak \
 		runtime/macros/hanoi/click.me \
 		runtime/macros/hanoi/hanoi.vim \
@@ -588,13 +595,10 @@ RT_ALL =	\
 		runtime/macros/urm/examples \
 		runtime/macros/urm/urm \
 		runtime/macros/urm/urm.vim \
-		runtime/menu.vim \
 		runtime/delmenu.vim \
-		runtime/makemenu.vim \
 		runtime/mswin.vim \
 		runtime/evim.vim \
 		runtime/optwin.vim \
-		runtime/scripts.vim \
 		runtime/ftplugin.vim \
 		runtime/ftplugof.vim \
 		runtime/indent.vim \
@@ -608,6 +612,10 @@ RT_ALL =	\
 
 # runtime script files
 RT_SCRIPTS =	\
+		runtime/filetype.vim \
+		runtime/scripts.vim \
+		runtime/menu.vim \
+		runtime/makemenu.vim \
 		runtime/colors/*.vim \
 		runtime/colors/README.txt \
 		runtime/compiler/*.vim \
@@ -624,8 +632,11 @@ RT_SCRIPTS =	\
 # Unix runtime
 RT_UNIX =	\
 		README_unix.txt \
+		runtime/vim16x16.png \
 		runtime/vim16x16.xpm \
+		runtime/vim32x32.png \
 		runtime/vim32x32.xpm \
+		runtime/vim48x48.png \
 		runtime/vim48x48.xpm \
 
 # Unix and DOS runtime without CR-LF translation
@@ -1103,7 +1114,6 @@ doslang: dist no_title.vim dist/$(COMMENT_LANG)
 	-rm -rf dist/vim
 	mkdir dist/vim
 	mkdir dist/vim/$(VIMRTDIR)
-	mkdir dist/vim/$(VIMRTDIR)/lang
 	tar cf - \
 		$(LANG_GEN) \
 		| (cd dist/vim/$(VIMRTDIR); tar xvf -)

diff --git a/README.txt b/README.txt
@@ -1,4 +1,4 @@
-README.txt for version 6.0am of Vim: Vi IMproved.
+README.txt for version 6.0an of Vim: Vi IMproved.
 
 
 WHAT IS VIM

diff --git a/README_ami.txt b/README_ami.txt
@@ -1,4 +1,4 @@
-README_ami.txt for version 6.0am of Vim: Vi IMproved.
+README_ami.txt for version 6.0an of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.

diff --git a/README_amibin.txt b/README_amibin.txt
@@ -1,4 +1,4 @@
-README_amibin.txt for version 6.0am of Vim: Vi IMproved.
+README_amibin.txt for version 6.0an of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.

diff --git a/README_amisrc.txt b/README_amisrc.txt
@@ -1,4 +1,4 @@
-README_amisrc.txt for version 6.0am of Vim: Vi IMproved.
+README_amisrc.txt for version 6.0an of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.

diff --git a/README_bindos.txt b/README_bindos.txt
@@ -1,4 +1,4 @@
-README_bindos.txt for version 6.0am of Vim: Vi IMproved.
+README_bindos.txt for version 6.0an 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.

diff --git a/README_dos.txt b/README_dos.txt
@@ -1,4 +1,4 @@
-README_dos.txt for version 6.0am of Vim: Vi IMproved.
+README_dos.txt for version 6.0an 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.

diff --git a/README_extra.txt b/README_extra.txt
@@ -1,4 +1,4 @@
-README_extra.txt for version 6.0am of Vim: Vi IMproved.
+README_extra.txt for version 6.0an of Vim: Vi IMproved.
 
 The extra archive of Vim is to be used in combination with the source archive
 (vim-6.0-src.tar.gz).  The extra archive is useless without it.

diff --git a/README_lang.txt b/README_lang.txt
@@ -1,4 +1,4 @@
-README_lang.txt for version 6.0am of Vim: Vi IMproved.
+README_lang.txt for version 6.0an of Vim: Vi IMproved.
 
 This file contains files for different languages:
 - Translated messages.

diff --git a/README_mac.txt b/README_mac.txt
@@ -1,4 +1,4 @@
-README_mac.txt for version 6.0am of Vim: Vi IMproved.
+README_mac.txt for version 6.0an of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Macintosh systems.
 See "README.txt" for general information about Vim.

diff --git a/README_ole.txt b/README_ole.txt
@@ -1,4 +1,4 @@
-README_ole.txt for version 6.0am of Vim: Vi IMproved.
+README_ole.txt for version 6.0an of Vim: Vi IMproved.
 
 This archive contains gvim.exe with OLE interface and VisVim.
 It is only for MS-Windows 95/98 and MS-Windows NT.

diff --git a/README_os2.txt b/README_os2.txt
@@ -1,4 +1,4 @@
-README_os2.txt for version 6.0am of Vim: Vi IMproved.
+README_os2.txt for version 6.0an of Vim: Vi IMproved.
 
 This file explains the installation of Vim on OS/2 systems.
 See "README.txt" for general information about Vim.

diff --git a/README_os390.txt b/README_os390.txt
@@ -1,4 +1,4 @@
-README_os_390.txt for version 6.0am of Vim: Vi IMproved.
+README_os_390.txt for version 6.0an of Vim: Vi IMproved.
 
 Welcome to the OS/390 Unix port of VIM.
 

diff --git a/README_src.txt b/README_src.txt
@@ -1,4 +1,4 @@
-README_src.txt for version 6.0am of Vim: Vi IMproved.
+README_src.txt for version 6.0an 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).  It is also used for other

diff --git a/README_srcdos.txt b/README_srcdos.txt
@@ -1,4 +1,4 @@
-README_srcdos.txt for version 6.0am of Vim: Vi IMproved.
+README_srcdos.txt for version 6.0an 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.

diff --git a/README_unix.txt b/README_unix.txt
@@ -1,4 +1,4 @@
-README_unix.txt for version 6.0am of Vim: Vi IMproved.
+README_unix.txt for version 6.0an of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.

diff --git a/README_vms.txt b/README_vms.txt
@@ -1,4 +1,4 @@
-README_vms.txt for version 6.0am of Vim: Vi IMproved.
+README_vms.txt for version 6.0an 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.

diff --git a/README_w32s.txt b/README_w32s.txt
@@ -1,4 +1,4 @@
-README_w32s.txt for version 6.0am of Vim: Vi IMproved.
+README_w32s.txt for version 6.0an 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.

diff --git a/nsis/README.txt b/nsis/README.txt
@@ -3,26 +3,33 @@ Installation System (NSIS), available at http://www.nullsoft.com/free/nsis/
 
 To build the installable .exe:
 
-1.  Unpack the runtime and source archives for the PC
-	You can generate these from the Unix sources and runtime plus the
-	extra archive.
+1.  Unpack three archives:
+	PC sources
+	PC runtime
+	PC language files
+    You can generate these from the Unix sources and runtime plus the extra
+    archive (see the Makefile in the top directory).
 
 2.  Go to the src directory and build:
-	gvim.exe,		(the OLE version)
+	gvim.exe (the OLE version),
 	vimrun.exe,
 	install.exe,
 	uninstal.exe,
-	xxd.exe,
+	xxd/xxd.exe,
 
-3.  Go to the GvimExt directory and build gvimext.dll.
+3.  Go to the GvimExt directory and build gvimext.dll (or get it from a binary
+    archive).
 
-4.  Go to the VisVim directory and build VisVim.dll.
+4.  Go to the VisVim directory and build VisVim.dll (or get it from a binary
+    archive).
 
-5.  Go to the OleVim directory and build OpenWithVim.exe and SendToVim.exe.
+5.  Go to the OleVim directory and build OpenWithVim.exe and SendToVim.exe (or
+    get them from a binary archive).
 
 
 Install NSIS if you didn't do that already.
+Also install UPX, if you want a compressed file.
 
 To build then, enter:
 
-> makensis gvim.nsi
+	makensis gvim.nsi