patch 7.4.1016v7.4.1016

Problem:    Still a few OS/2 pieces remain.
Solution:   Delete more.

4 files changed, 4 insertions, 76 deletions

diff --git a/Filelist b/Filelist
index 6170610b6b..80049256d0 100644
--- a/Filelist
+++ b/Filelist
@@ -445,15 +445,6 @@ SRC_VMS =	\
 		src/xxd/Make_vms.mms \
 		vimtutor.com \
 
-# source files for OS/2 (in the extra archive)
-SRC_OS2 =	\
-		src/Make_os2.mak \
-		src/os_os2_cfg.h \
-		src/testdir/Make_os2.mak \
-		src/testdir/todos.vim \
-		src/testdir/os2.vim \
-		src/xxd/Make_os2.mak \
-
 # source files for QNX (in the extra archive)
 SRC_QNX =	\
 		src/os_qnx.c \
@@ -470,7 +461,6 @@ SRC_EXTRA =	\
 		$(SRC_DOS) \
 		$(SRC_DOS_BIN) \
 		$(SRC_MAC) \
-		$(SRC_OS2) \
 		$(SRC_QNX) \
 		$(SRC_VMS) \
 		README_os390.txt \
diff --git a/README_os2.txt b/README_os2.txt
index 5602706e71..5f2ebc7552 100644
--- a/README_os2.txt
+++ b/README_os2.txt
@@ -1,58 +1,5 @@
 README_os2.txt for version 7.4 of Vim: Vi IMproved.
 
-This file explains the installation of Vim on OS/2 systems.
+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.
-
-
-NOTE: You will need two archives:
-  vim74rt.zip	contains the runtime files (same as for the PC version)
-  vim74os2.zip	contains the OS/2 executables
-
-1. Go to the directory where you want to put the Vim files.  Examples:
-	cd C:\
-	cd D:\editors
-
-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 vim74os2.zip
-	unzip vim74os2.zip
-
-   After you unpacked the files, you can still move the whole directory tree
-   to another location.
-
-3. Add the directory where vim.exe is to your path.  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
-
-That's it!
-
-
-Extra remarks:
-
-- 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 with the path you use)
-  Your own files:
-	C:\vim\_vimrc			Your personal vimrc.
-	C:\vim\_viminfo			Dynamic info for 'viminfo'.
-	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
-
-- You can put your Vim executable anywhere else.  If the executable is not
-  with the other distributed 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
-
-For further information, type this inside Vim:
-	:help os2
diff --git a/src/version.c b/src/version.c
index 1e9dabd6b3..b491c48461 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1016,
+/**/
     1015,
 /**/
     1014,
diff --git a/src/xxd/Make_os2.mak b/src/xxd/Make_os2.mak
deleted file mode 100644
index cb6694e1cf..0000000000
--- a/src/xxd/Make_os2.mak
+++ /dev/null
@@ -1,11 +0,0 @@
-# A very (if most the most) simplistic Makefile for OS/2
-
-CC=gcc
-CFLAGS=-O2 -fno-strength-reduce -DOS2
-
-xxd.exe: xxd.c
-	$(CC) $(CFLAGS) -s -o $@ $<
-
-clean:
-	- del xxd.o
-	- del xxd.exe