0
0
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00

patch 7.4.1009

Problem:    There are still #ifdefs for ARCHIE.
Solution:   Remove references to ARCHIE, the code was removed in Vim 5.
This commit is contained in:
Bram Moolenaar
2015-12-31 19:53:21 +01:00
parent e7fedb6ebe
commit 53076830fe
8 changed files with 16 additions and 23 deletions

View File

@@ -74,7 +74,8 @@ typedef struct
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 @@ main
if (GARGCOUNT > 0)
{
#if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE)
#ifdef EXPAND_FILENAMES
/*
* Expand wildcards in file names.
*/
@@ -987,6 +988,7 @@ vim_main2(int argc UNUSED, char **argv UNUSED)
* main loop. */
{
int default_regname = 0;
adjust_clip_reg(&default_regname);
set_reg_var(default_regname);
}
@@ -1879,7 +1881,7 @@ command_line_scan(parmp)
}
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 @@ scripterror:
#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 @@ usage()
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