Mercurial > vim
changeset 7410:08e62c4fc17d v7.4.1009
commit https://github.com/vim/vim/commit/53076830fea6df737455523f7e235bfe4f79864d
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 31 19:53:21 2015 +0100
patch 7.4.1009
Problem: There are still #ifdefs for ARCHIE.
Solution: Remove references to ARCHIE, the code was removed in Vim 5.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 31 Dec 2015 20:00:05 +0100 |
| parents | 5a939c1fc4a9 |
| children | a7f321e32883 |
| files | src/ex_cmds.c src/ex_docmd.c src/fileio.c src/main.c src/memline.c src/option.c src/term.c src/version.c |
| diffstat | 8 files changed, 16 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1570,7 +1570,7 @@ make_filter_cmd(cmd, itmp, otmp) char_u *buf; long_u len; -#if defined(UNIX) && !defined(ARCHIE) +#if defined(UNIX) int is_fish_shell; char_u *shell_name = get_isolated_shell_name(); @@ -1590,7 +1590,7 @@ make_filter_cmd(cmd, itmp, otmp) if (buf == NULL) return NULL; -#if defined(UNIX) && !defined(ARCHIE) +#if defined(UNIX) /* * Put braces around the command (for concatenated commands) when * redirecting input and/or output.
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -7835,7 +7835,7 @@ alist_new() # endif #endif -#if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE) || defined(PROTO) +#if (!defined(UNIX) && !defined(__EMX__)) || defined(PROTO) /* * Expand the file names in the global argument list. * If "fnum_list" is not NULL, use "fnum_list[fnum_len]" as a list of buffer
--- a/src/fileio.c +++ b/src/fileio.c @@ -3510,7 +3510,7 @@ buf_write(buf, fname, sfname, start, end /* * Get information about original file (if there is one). */ -#if defined(UNIX) && !defined(ARCHIE) +#if defined(UNIX) st_old.st_dev = 0; st_old.st_ino = 0; perm = -1; @@ -4126,7 +4126,7 @@ buf_write(buf, fname, sfname, start, end } } -#if defined(UNIX) && !defined(ARCHIE) +#if defined(UNIX) /* When using ":w!" and the file was read-only: make it writable */ if (forceit && perm >= 0 && !(perm & 0200) && st_old.st_uid == getuid() && vim_strchr(p_cpo, CPO_FWRITE) == NULL)
--- a/src/main.c +++ b/src/main.c @@ -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 U * 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
--- a/src/memline.c +++ b/src/memline.c @@ -4211,7 +4211,7 @@ findswapname(buf, dirp, old_fname) #endif char_u *buf_fname = buf->b_fname; -#if !defined(SHORT_FNAME) && (!defined(UNIX) || defined(ARCHIE)) +#if !defined(SHORT_FNAME) && !defined(UNIX) # define CREATE_DUMMY_FILE FILE *dummyfd = NULL; @@ -4271,7 +4271,7 @@ findswapname(buf, dirp, old_fname) fname = NULL; break; } -#if defined(UNIX) && !defined(ARCHIE) && !defined(SHORT_FNAME) +#if defined(UNIX) && !defined(SHORT_FNAME) /* * Some systems have a MS-DOS compatible filesystem that use 8.3 character * file names. If this is the first try and the swap file name does not fit in
--- a/src/option.c +++ b/src/option.c @@ -2297,11 +2297,7 @@ static struct vimoption # if defined(WIN3264) (char_u *)"", /* set in set_init_1() */ # else -# if defined(ARCHIE) - (char_u *)"gos", -# else (char_u *)"sh", -# endif # endif # endif # endif @@ -2321,11 +2317,7 @@ static struct vimoption (char_u *)&p_sp, PV_NONE, { #if defined(UNIX) -# ifdef ARCHIE - (char_u *)"2>", -# else (char_u *)"| tee", -# endif #else (char_u *)">", #endif