patch 7.4.1008
Problem: The OS/2 code pollutes the source while nobody uses it these days.
Solution: Drop the support for OS/2.
diff --git a/src/os_unix.h b/src/os_unix.h
index 5fc95ee..0dd75cf 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -274,9 +274,6 @@
# endif
#endif
-#if !defined(USR_EXRC_FILE2) && defined(OS2)
-# define USR_EXRC_FILE2 "$VIM/.exrc"
-#endif
#if !defined(USR_EXRC_FILE2) && defined(VMS)
# define USR_EXRC_FILE2 "sys$login:_exrc"
#endif
@@ -291,20 +288,13 @@
#if !defined(USR_VIMRC_FILE2)
-# ifdef OS2
-# define USR_VIMRC_FILE2 "$HOME/vimfiles/vimrc"
+# ifdef VMS
+# define USR_VIMRC_FILE2 "sys$login:vimfiles/vimrc"
# else
-# ifdef VMS
-# define USR_VIMRC_FILE2 "sys$login:vimfiles/vimrc"
-# else
-# define USR_VIMRC_FILE2 "~/.vim/vimrc"
-# endif
+# define USR_VIMRC_FILE2 "~/.vim/vimrc"
# endif
#endif
-#if !defined(USR_VIMRC_FILE3) && defined(OS2)
-# define USR_VIMRC_FILE3 "$VIM/.vimrc"
-#endif
#if !defined(USR_VIMRC_FILE3) && defined(VMS)
# define USR_VIMRC_FILE3 "sys$login:_vimrc"
#endif
@@ -318,14 +308,10 @@
#endif
#ifndef USR_GVIMRC_FILE2
-# ifdef OS2
-# define USR_GVIMRC_FILE2 "$HOME/vimfiles/gvimrc"
+# ifdef VMS
+# define USR_GVIMRC_FILE2 "sys$login:vimfiles/gvimrc"
# else
-# ifdef VMS
-# define USR_GVIMRC_FILE2 "sys$login:vimfiles/gvimrc"
-# else
-# define USR_GVIMRC_FILE2 "~/.vim/gvimrc"
-# endif
+# define USR_GVIMRC_FILE2 "~/.vim/gvimrc"
# endif
#endif
@@ -347,9 +333,6 @@
# define VIMINFO_FILE "$HOME/.viminfo"
# endif
# endif
-# if !defined(VIMINFO_FILE2) && defined(OS2)
-# define VIMINFO_FILE2 "$VIM/.viminfo"
-# endif
# if !defined(VIMINFO_FILE2) && defined(VMS)
# define VIMINFO_FILE2 "sys$login:_viminfo"
# endif
@@ -374,74 +357,51 @@
#endif
#ifndef DFLT_BDIR
-# ifdef OS2
-# define DFLT_BDIR ".,c:/tmp,~/tmp,~/"
+# ifdef VMS
+# define DFLT_BDIR "./,sys$login:,tmp:"
# else
-# ifdef VMS
-# define DFLT_BDIR "./,sys$login:,tmp:"
-# else
-# define DFLT_BDIR ".,~/tmp,~/" /* default for 'backupdir' */
-# endif
+# define DFLT_BDIR ".,~/tmp,~/" /* default for 'backupdir' */
# endif
#endif
#ifndef DFLT_DIR
-# ifdef OS2
-# define DFLT_DIR ".,~/tmp,c:/tmp,/tmp"
+# ifdef VMS
+# define DFLT_DIR "./,sys$login:,tmp:"
# else
-# ifdef VMS
-# define DFLT_DIR "./,sys$login:,tmp:"
-# else
-# define DFLT_DIR ".,~/tmp,/var/tmp,/tmp" /* default for 'directory' */
-# endif
+# define DFLT_DIR ".,~/tmp,/var/tmp,/tmp" /* default for 'directory' */
# endif
#endif
#ifndef DFLT_VDIR
-# ifdef OS2
-# define DFLT_VDIR "$VIM/vimfiles/view"
+# ifdef VMS
+# define DFLT_VDIR "sys$login:vimfiles/view"
# else
-# ifdef VMS
-# define DFLT_VDIR "sys$login:vimfiles/view"
-# else
-# define DFLT_VDIR "$HOME/.vim/view" /* default for 'viewdir' */
-# endif
+# define DFLT_VDIR "$HOME/.vim/view" /* default for 'viewdir' */
# endif
#endif
#define DFLT_ERRORFILE "errors.err"
-#ifdef OS2
-# define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/vimfiles/after"
+#ifdef VMS
+# define DFLT_RUNTIMEPATH "sys$login:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,sys$login:vimfiles/after"
#else
-# ifdef VMS
-# define DFLT_RUNTIMEPATH "sys$login:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,sys$login:vimfiles/after"
+# ifdef RUNTIME_GLOBAL
+# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
# else
-# ifdef RUNTIME_GLOBAL
-# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
-# else
-# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
-# endif
+# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
# endif
#endif
-#ifdef OS2
-/*
- * Try several directories to put the temp files.
- */
-# define TEMPDIRNAMES "$TMP", "$TEMP", "c:\\TMP", "c:\\TEMP", ""
-# define TEMPNAMELEN 128
-#else
-# ifdef VMS
-# ifndef VAX
-# define VMS_TEMPNAM /* to fix default .LIS extension */
-# endif
-# define TEMPNAME "TMP:v?XXXXXX.txt"
-# define TEMPNAMELEN 28
-# else
-# define TEMPDIRNAMES "$TMPDIR", "/tmp", ".", "$HOME"
-# define TEMPNAMELEN 256
+#ifdef VMS
+# ifndef VAX
+# define VMS_TEMPNAM /* to fix default .LIS extension */
# endif
+# define TEMPNAME "TMP:v?XXXXXX.txt"
+# define TEMPNAMELEN 28
+#else
+/* Try several directories to put the temp files. */
+# define TEMPDIRNAMES "$TMPDIR", "/tmp", ".", "$HOME"
+# define TEMPNAMELEN 256
#endif
/* Special wildcards that need to be handled by the shell */