patch 7.4.1009
Problem: There are still #ifdefs for ARCHIE.
Solution: Remove references to ARCHIE, the code was removed in Vim 5.
diff --git a/src/main.c b/src/main.c
index 096652f..584687e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -74,7 +74,8 @@
char_u *serverStrEnc; /* encoding of serverStr */
char_u *servername; /* allocated name for our server */
#endif
-#if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE)
+#if !defined(UNIX) && !defined(__EMX__)
+# define EXPAND_FILENAMES
int literal; /* don't expand file names */
#endif
#ifdef MSWIN
@@ -401,7 +402,7 @@
if (GARGCOUNT > 0)
{
-#if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE)
+#ifdef EXPAND_FILENAMES
/*
* Expand wildcards in file names.
*/
@@ -987,6 +988,7 @@
* main loop. */
{
int default_regname = 0;
+
adjust_clip_reg(&default_regname);
set_reg_var(default_regname);
}
@@ -1879,7 +1881,7 @@
}
else if (STRNICMP(argv[0] + argv_idx, "literal", 7) == 0)
{
-#if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE)
+#ifdef EXPAND_FILENAMES
parmp->literal = TRUE;
#endif
}
@@ -2456,7 +2458,7 @@
#endif
alist_add(&global_alist, p,
-#if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE)
+#ifdef EXPAND_FILENAMES
parmp->literal ? 2 : 0 /* add buffer nr after exp. */
#else
2 /* add buffer number now and use curbuf */
@@ -3268,7 +3270,7 @@
mch_msg(_("\n\nArguments:\n"));
main_msg(_("--\t\t\tOnly file names after this"));
-#if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE)
+#ifdef EXPAND_FILENAMES
main_msg(_("--literal\t\tDon't expand wildcards"));
#endif
#ifdef FEAT_OLE