Patch 7.4.2048
Problem: There is still code and help for unsupported systems.
Solution: Remove the code and text. (Hirohito Higashi)
Files: runtime/doc/eval.txt, runtime/lang/menu_sk_sk.vim,
runtime/menu.vim, runtime/optwin.vim, src/Make_bc5.mak,
src/ex_docmd.c, src/feature.h, src/fileio.c, src/globals.h,
src/main.c, src/memfile.c, src/memline.c, src/misc1.c,
src/misc2.c, src/option.c, src/option.h, src/os_unix.c,
src/os_unix.h, src/proto.h, src/term.c, src/undo.c, src/version.c,
src/vim.h, src/xxd/xxd.c
*** ../vim-7.4.2047/runtime/doc/eval.txt 2016-07-15 21:24:41.185452723
+0200
--- runtime/doc/eval.txt 2016-07-16 14:33:33.435016351 +0200
***************
*** 7798,7810 ****
digraphs Compiled with support for digraphs.
directx Compiled with support for Direct-X and
'renderoptions'.
dnd Compiled with support for the "~ register |quote_~|.
- dos16 16 bits DOS version of Vim.
- dos32 32 bits DOS (DJGPP) version of Vim.
ebcdic Compiled on a machine with ebcdic character set.
emacs_tags Compiled with support for Emacs tags.
eval Compiled with expression evaluation support. Always
true, of course!
! ex_extra Compiled with extra Ex commands |+ex_extra|.
extra_search Compiled with support for |'incsearch'| and
|'hlsearch'|
farsi Compiled with Farsi support |farsi|.
--- 7934,7944 ----
digraphs Compiled with support for digraphs.
directx Compiled with support for Direct-X and
'renderoptions'.
dnd Compiled with support for the "~ register |quote_~|.
ebcdic Compiled on a machine with ebcdic character set.
emacs_tags Compiled with support for Emacs tags.
eval Compiled with expression evaluation support. Always
true, of course!
! ex_extra |+ex_extra|, always true now
extra_search Compiled with support for |'incsearch'| and
|'hlsearch'|
farsi Compiled with Farsi support |farsi|.
***************
*** 7847,7853 ****
and the argument list |arglist|.
localmap Compiled with local mappings and abbr. |:map-local|
lua Compiled with Lua interface |Lua|.
! mac Macintosh version of Vim.
macunix Compiled for OS X, with darwin
osx Compiled for OS X, with or without darwin
menu Compiled with support for |:menu|.
--- 7981,7987 ----
and the argument list |arglist|.
localmap Compiled with local mappings and abbr. |:map-local|
lua Compiled with Lua interface |Lua|.
! mac Any Macintosh version of Vim.
macunix Compiled for OS X, with darwin
osx Compiled for OS X, with or without darwin
menu Compiled with support for |:menu|.
***************
*** 7872,7878 ****
netbeans_intg Compiled with support for |netbeans|.
num64 Compiled with 64-bit |Number| support.
ole Compiled with OLE automation support for Win32.
- os2 OS/2 version of Vim.
packages Compiled with |packages| support.
path_extra Compiled with up/downwards search in 'path' and 'tags'
perl Compiled with Perl interface.
--- 8006,8011 ----
***************
*** 7891,7897 ****
showcmd Compiled with 'showcmd' support.
signs Compiled with |:sign| support.
smartindent Compiled with 'smartindent' support.
- sniff Compiled with SNiFF interface support.
spell Compiled with spell checking support |spell|.
startuptime Compiled with |--startuptime| support.
statusline Compiled with support for 'statusline', 'rulerformat'
--- 8024,8029 ----
***************
*** 7908,7924 ****
--- 8040,8059 ----
tag_any_white Compiled with support for any white characters in tags
files |tag-any-white|.
tcl Compiled with Tcl interface.
+ termguicolors Compiled with true color in terminal support.
terminfo Compiled with terminfo instead of termcap.
termresponse Compiled with support for |t_RV| and |v:termresponse|.
textobjects Compiled with support for |text-objects|.
tgetent Compiled with tgetent support, able to use a
termcap
or terminfo file.
+ timers Compiled with |timer_start()| support.
title Compiled with window title support |'title'|.
toolbar Compiled with support for |gui-toolbar|.
unix Unix version of Vim.
user_commands User-defined commands.
vertsplit Compiled with vertically split windows |:vsplit|.
vim_starting True while initial source'ing takes place. |startup|
+ *vim_starting*
viminfo Compiled with viminfo support.
virtualedit Compiled with 'virtualedit' option.
visual Compiled with Visual mode.
***************
*** 7928,7934 ****
vreplace Compiled with |gR| and |gr| commands.
wildignore Compiled with 'wildignore' option.
wildmenu Compiled with 'wildmenu' option.
- win16 Win16 version of Vim (MS-Windows 3.1).
win32 Win32 version of Vim (MS-Windows 95 and later, 32 or
64 bits)
win32unix Win32 version of Vim, using Unix files (Cygwin)
--- 8063,8068 ----
*** ../vim-7.4.2047/runtime/lang/menu_sk_sk.vim 2010-05-15 13:04:02.000000000
+0200
--- runtime/lang/menu_sk_sk.vim 2016-07-16 14:33:33.435016351 +0200
***************
*** 2,8 ****
" Translated By: Martin Lacko <la...@host.sk>
" Last Change: 2002 May 27
! if has("win32") || has("win16") || has("dos16") || has("dos32")
source <sfile>:p:h/menu_sk_sk.1250.vim
else
source <sfile>:p:h/menu_sk_sk.iso_8859-2.vim
--- 2,8 ----
" Translated By: Martin Lacko <la...@host.sk>
" Last Change: 2002 May 27
! if has("win32")
source <sfile>:p:h/menu_sk_sk.1250.vim
else
source <sfile>:p:h/menu_sk_sk.iso_8859-2.vim
*** ../vim-7.4.2047/runtime/menu.vim 2013-05-17 13:01:55.000000000 +0200
--- runtime/menu.vim 2016-07-16 14:33:33.435016351 +0200
***************
*** 2,8 ****
" You can also use this as a start for your own set of menus.
"
" Maintainer: Bram Moolenaar <b...@vim.org>
! " Last Change: 2013 May 17
" Note that ":an" (short for ":anoremenu") is often used to make a menu work
" in all modes and avoid side effects from mappings defined by the user.
--- 2,8 ----
" You can also use this as a start for your own set of menus.
"
" Maintainer: Bram Moolenaar <b...@vim.org>
! " Last Change: 2014 May 22
" Note that ":an" (short for ":anoremenu") is often used to make a menu work
" in all modes and avoid side effects from mappings defined by the user.
***************
*** 188,194 ****
fun! s:EditVimrc()
if $MYVIMRC != ''
let fname = $MYVIMRC
! elseif has("win32") || has("dos32") || has("dos16") || has("os2")
if $HOME != ''
let fname = $HOME . "/_vimrc"
else
--- 188,194 ----
fun! s:EditVimrc()
if $MYVIMRC != ''
let fname = $MYVIMRC
! elseif has("win32")
if $HOME != ''
let fname = $HOME . "/_vimrc"
else
***************
*** 477,482 ****
--- 477,483 ----
an 40.340.110 &Tools.&Folding.&Enable/Disable\ folds<Tab>zi zi
an 40.340.120 &Tools.&Folding.&View\ Cursor\ Line<Tab>zv zv
an 40.340.120 &Tools.&Folding.Vie&w\ Cursor\ Line\ only<Tab>zMzx zMzx
+ inoremenu 40.340.120 &Tools.&Folding.Vie&w\ Cursor\ Line\ only<Tab>zMzx
<C-O>zM<C-O>zx
an 40.340.130 &Tools.&Folding.C&lose\ more\ folds<Tab>zm zm
an 40.340.140 &Tools.&Folding.&Close\ all\ folds<Tab>zM zM
an 40.340.150 &Tools.&Folding.O&pen\ more\ folds<Tab>zr zr
***************
*** 565,571 ****
func! s:XxdFind()
if !exists("g:xxdprogram")
" On the PC xxd may not be in the path but in the install directory
! if (has("win32") || has("dos32")) && !executable("xxd")
let g:xxdprogram = $VIMRUNTIME . (&shellslash ? '/' : '\') . "xxd.exe"
else
let g:xxdprogram = "xxd"
--- 566,572 ----
func! s:XxdFind()
if !exists("g:xxdprogram")
" On the PC xxd may not be in the path but in the install directory
! if has("win32") && !executable("xxd")
let g:xxdprogram = $VIMRUNTIME . (&shellslash ? '/' : '\') . "xxd.exe"
else
let g:xxdprogram = "xxd"
*** ../vim-7.4.2047/runtime/optwin.vim 2016-04-30 16:49:45.598789137 +0200
--- runtime/optwin.vim 2016-07-16 14:33:33.435016351 +0200
***************
*** 540,546 ****
call append("$", " \tset sj=" . &sj)
call append("$", "ttyscroll\tmaximum number of lines to use scrolling instead
of redrawing")
call append("$", " \tset tsl=" . &tsl)
! if has("gui") || has("msdos") || has("win32")
call append("$", "guicursor\tspecifies what the cursor looks like in
different modes")
call <SID>OptionG("gcr", &gcr)
endif
--- 540,546 ----
call append("$", " \tset sj=" . &sj)
call append("$", "ttyscroll\tmaximum number of lines to use scrolling instead
of redrawing")
call append("$", " \tset tsl=" . &tsl)
! if has("gui") || has("win32")
call append("$", "guicursor\tspecifies what the cursor looks like in
different modes")
call <SID>OptionG("gcr", &gcr)
endif
***************
*** 1016,1026 ****
call <SID>OptionG("pm", &pm)
call append("$", "fsync\tforcibly sync the file to disk after writing it")
call <SID>BinOptionG("fs", &fs)
! if !has("msdos")
! call append("$", "shortname\tuse 8.3 file names")
! call append("$", "\t(local to buffer)")
! call <SID>BinOptionL("sn")
! endif
call append("$", "cryptmethod\tencryption method for file writing: zip or
blowfish")
call append("$", "\t(local to buffer)")
call <SID>OptionL("cm")
--- 1016,1024 ----
call <SID>OptionG("pm", &pm)
call append("$", "fsync\tforcibly sync the file to disk after writing it")
call <SID>BinOptionG("fs", &fs)
! call append("$", "shortname\tuse 8.3 file names")
! call append("$", "\t(local to buffer)")
! call <SID>BinOptionL("sn")
call append("$", "cryptmethod\tencryption method for file writing: zip or
blowfish")
call append("$", "\t(local to buffer)")
call <SID>OptionL("cm")
***************
*** 1136,1155 ****
endif
! if has("msdos") || has("os2") || has("win16") || has("win32") ||
has("osfiletype")
call <SID>Header("system specific")
- if has("msdos")
- call append("$", "bioskey\tcall the BIOS to get a keyoard character")
- call <SID>BinOptionG("biosk", &biosk)
- call append("$", "conskey\tuse direct console I/O to get a keyboard
character")
- call <SID>BinOptionG("consk", &consk)
- endif
if has("osfiletype")
call append("$", "osfiletype\tOS-specific information about the type of
file")
call append("$", "\t(local to buffer)")
call <SID>OptionL("oft")
endif
! if has("msdos") || has("os2") || has("win16") || has("win32")
call append("$", "shellslash\tuse forward slashes in file names; for
Unix-like shells")
call <SID>BinOptionG("ssl", &ssl)
endif
--- 1134,1147 ----
endif
! if has("win32") || has("osfiletype")
call <SID>Header("system specific")
if has("osfiletype")
call append("$", "osfiletype\tOS-specific information about the type of
file")
call append("$", "\t(local to buffer)")
call <SID>OptionL("oft")
endif
! if has("win32")
call append("$", "shellslash\tuse forward slashes in file names; for
Unix-like shells")
call <SID>BinOptionG("ssl", &ssl)
endif
*** ../vim-7.4.2047/src/Make_bc5.mak 2016-07-02 20:27:29.957436300 +0200
--- src/Make_bc5.mak 2016-07-16 14:33:33.439016315 +0200
***************
*** 1,7 ****
#
# Makefile for Vim.
# Compiler: Borland C++ 5.0 and later 32-bit compiler
! # Targets: Dos16 or Win32 (Windows NT and Windows 95) (with/without GUI)
#
# NOTE: THIS IS OLD AND PROBABLY NO LONGER WORKS.
#
--- 1,7 ----
#
# Makefile for Vim.
# Compiler: Borland C++ 5.0 and later 32-bit compiler
! # Targets: Win32 (Windows NT and Windows 95) (with/without GUI)
#
# NOTE: THIS IS OLD AND PROBABLY NO LONGER WORKS.
#
*** ../vim-7.4.2047/src/ex_docmd.c 2016-07-10 22:11:11.866751401 +0200
--- src/ex_docmd.c 2016-07-16 14:33:33.443016278 +0200
***************
*** 7713,7723 ****
* list. This function takes over responsibility for freeing the list.
*
* XXX The list is made into the argument list. This is freed using
! * FreeWild(), which does a series of vim_free() calls, unless the two defines
! * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
! * routine _fnexplodefree() is used. This may cause problems, but as the drop
! * file functionality is (currently) not in EMX this is not presently a
! * problem.
*/
void
handle_drop(
--- 7713,7719 ----
* list. This function takes over responsibility for freeing the list.
*
* XXX The list is made into the argument list. This is freed using
! * FreeWild(), which does a series of vim_free() calls.
*/
void
handle_drop(
***************
*** 7851,7857 ****
# endif
#endif
! #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
--- 7847,7853 ----
# endif
#endif
! #if !defined(UNIX) || 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
*** ../vim-7.4.2047/src/feature.h 2016-07-01 18:16:47.489936307 +0200
--- src/feature.h 2016-07-16 14:33:33.443016278 +0200
***************
*** 56,63 ****
/*
* For Unix, Mac and Win32 use +huge by default. These days CPUs are fast and
* Memory is cheap.
! * Use +big for older systems: Other MS-Windows, dos32, OS/2 and VMS.
! * The dos16 version has very little RAM available, use +small.
* Otherwise use +normal
*/
#if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \
--- 56,62 ----
/*
* For Unix, Mac and Win32 use +huge by default. These days CPUs are fast and
* Memory is cheap.
! * Use +big for older systems: Other MS-Windows and VMS.
* Otherwise use +normal
*/
#if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \
*** ../vim-7.4.2047/src/fileio.c 2016-07-14 20:37:03.880826217 +0200
--- src/fileio.c 2016-07-16 14:33:33.447016242 +0200
***************
*** 367,373 ****
*/
if (sfname == NULL)
sfname = fname;
! #if defined(UNIX) || defined(__EMX__)
fname = sfname;
#endif
--- 367,373 ----
*/
if (sfname == NULL)
sfname = fname;
! #if defined(UNIX)
fname = sfname;
#endif
***************
*** 3150,3156 ****
int prev_got_int = got_int;
int file_readonly = FALSE; /* overwritten file is
read-only */
static char *err_readonly = "is read-only (cannot override:
\"W\" in 'cpoptions')";
! #if defined(UNIX) || defined(__EMX__XX) /*XXX fix me sometime? */
int made_writable = FALSE; /* 'w' bit has been set */
#endif
/* writing everything */
--- 3150,3156 ----
int prev_got_int = got_int;
int file_readonly = FALSE; /* overwritten file is
read-only */
static char *err_readonly = "is read-only (cannot override:
\"W\" in 'cpoptions')";
! #if defined(UNIX) /*XXX fix me sometime? */
int made_writable = FALSE; /* 'w' bit has been set */
#endif
/* writing everything */
***************
*** 7320,7331 ****
{
if (vim_FullName(tempdir, buf, MAXPATHL, FALSE) == FAIL)
STRCPY(buf, tempdir);
! # ifdef __EMX__
! if (vim_strchr(buf, '/') != NULL)
! STRCAT(buf, "/");
! else
! # endif
! add_pathsep(buf);
vim_tempdir = vim_strsave(buf);
vim_free(buf);
}
--- 7320,7326 ----
{
if (vim_FullName(tempdir, buf, MAXPATHL, FALSE) == FAIL)
STRCPY(buf, tempdir);
! add_pathsep(buf);
vim_tempdir = vim_strsave(buf);
vim_free(buf);
}
***************
*** 7385,7399 ****
if (itmp[0] != '$' && mch_isdir(itmp))
{
/* directory exists */
! # ifdef __EMX__
! /* If $TMP contains a forward slash (perhaps using bash or
! * tcsh), don't add a backslash, use a forward slash!
! * Adding 2 backslashes didn't work. */
! if (vim_strchr(itmp, '/') != NULL)
! STRCAT(itmp, "/");
! else
! # endif
! add_pathsep(itmp);
# ifdef HAVE_MKDTEMP
{
--- 7380,7386 ----
if (itmp[0] != '$' && mch_isdir(itmp))
{
/* directory exists */
! add_pathsep(itmp);
# ifdef HAVE_MKDTEMP
{
*** ../vim-7.4.2047/src/globals.h 2016-07-14 23:03:15.112509390 +0200
--- src/globals.h 2016-07-16 14:33:33.447016242 +0200
***************
*** 197,203 ****
#endif
EXTERN int quit_more INIT(= FALSE); /* 'q' hit at "--more--" msg */
! #if defined(UNIX) || defined(__EMX__) || defined(VMS) || defined(MACOS_X)
EXTERN int newline_on_exit INIT(= FALSE); /* did msg in altern. screen */
EXTERN int intr_char INIT(= 0); /* extra interrupt character */
#endif
--- 197,203 ----
#endif
EXTERN int quit_more INIT(= FALSE); /* 'q' hit at "--more--" msg */
! #if defined(UNIX) || defined(VMS) || defined(MACOS_X)
EXTERN int newline_on_exit INIT(= FALSE); /* did msg in altern. screen */
EXTERN int intr_char INIT(= 0); /* extra interrupt character */
#endif
*** ../vim-7.4.2047/src/main.c 2016-07-10 22:11:11.870751341 +0200
--- src/main.c 2016-07-16 14:33:33.451016205 +0200
***************
*** 75,81 ****
char_u *serverStrEnc; /* encoding of serverStr */
char_u *servername; /* allocated name for our server */
#endif
! #if !defined(UNIX) && !defined(__EMX__)
# define EXPAND_FILENAMES
int literal; /* don't expand file names */
#endif
--- 75,81 ----
char_u *serverStrEnc; /* encoding of serverStr */
char_u *servername; /* allocated name for our server */
#endif
! #if !defined(UNIX)
# define EXPAND_FILENAMES
int literal; /* don't expand file names */
#endif
***************
*** 183,189 ****
#if defined(WIN32) && defined(FEAT_MBYTE)
/*
! * MingW expands command line arguments, which confuses our code to
* convert when 'encoding' changes. Get the unexpanded arguments.
*/
argc = get_cmd_argsW(&argv);
--- 183,189 ----
#if defined(WIN32) && defined(FEAT_MBYTE)
/*
! * MinGW expands command line arguments, which confuses our code to
* convert when 'encoding' changes. Get the unexpanded arguments.
*/
argc = get_cmd_argsW(&argv);
***************
*** 231,240 ****
#endif
starttime = time(NULL);
- #ifdef __EMX__
- _wildcard(¶ms.argc, ¶ms.argv);
- #endif
-
#ifdef FEAT_MBYTE
(void)mb_init(); /* init mb_bytelen_tab[] to ones */
#endif
--- 231,236 ----
***************
*** 3216,3222 ****
int n, /* one of the ME_ defines */
char_u *str) /* extra argument or NULL */
{
! #if defined(UNIX) || defined(__EMX__) || defined(VMS)
reset_signals(); /* kill us with CTRL-C here, if you like */
#endif
--- 3212,3218 ----
int n, /* one of the ME_ defines */
char_u *str) /* extra argument or NULL */
{
! #if defined(UNIX) || defined(VMS)
reset_signals(); /* kill us with CTRL-C here, if you like */
#endif
***************
*** 3269,3275 ****
#endif
};
! #if defined(UNIX) || defined(__EMX__) || defined(VMS)
reset_signals(); /* kill us with CTRL-C here, if you like */
#endif
--- 3265,3271 ----
#endif
};
! #if defined(UNIX) || defined(VMS)
reset_signals(); /* kill us with CTRL-C here, if you like */
#endif
*** ../vim-7.4.2047/src/memfile.c 2016-07-01 17:17:13.286266820 +0200
--- src/memfile.c 2016-07-16 14:33:33.451016205 +0200
***************
*** 602,617 ****
# ifdef HAVE_FSYNC
/*
* most Unixes have the very useful fsync() function, just what we need.
- * However, with OS/2 and EMX it is also available, but there are
- * reports of bad problems with it (a bug in HPFS.IFS).
- * So we disable use of it here in case someone tries to be smart
- * and changes os_os2_cfg.h... (even though there is no __EMX__ test
- * in the #if, as __EMX__ does not have sync(); we hope for a timely
- * sync from the system itself).
*/
- # if defined(__EMX__)
- error "Don't use fsync with EMX! Read emxdoc.doc or emxfix01.doc for info."
- # endif
if (STRCMP(p_sws, "fsync") == 0)
{
if (fsync(mfp->mf_fd))
--- 602,608 ----
*** ../vim-7.4.2047/src/memline.c 2016-07-01 17:17:13.286266820 +0200
--- src/memline.c 2016-07-16 14:33:33.455016169 +0200
***************
*** 2038,2044 ****
}
#endif
! #if (defined(UNIX) || defined(__EMX__) || defined(VMS)) &&
(defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG))
static int process_still_running;
#endif
--- 2038,2044 ----
}
#endif
! #if (defined(UNIX) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) ||
defined(FEAT_CON_DIALOG))
static int process_still_running;
#endif
***************
*** 2126,2132 ****
{
MSG_PUTS(_("\n process ID: "));
msg_outnum(char_to_long(b0.b0_pid));
! #if defined(UNIX) || defined(__EMX__)
/* EMX kill() not working correctly, it seems */
if (kill((pid_t)char_to_long(b0.b0_pid), 0) == 0)
{
--- 2126,2132 ----
{
MSG_PUTS(_("\n process ID: "));
msg_outnum(char_to_long(b0.b0_pid));
! #if defined(UNIX)
/* EMX kill() not working correctly, it seems */
if (kill((pid_t)char_to_long(b0.b0_pid), 0) == 0)
{
***************
*** 4445,4451 ****
}
#endif
! #if (defined(UNIX) || defined(__EMX__) || defined(VMS)) &&
(defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG))
process_still_running = FALSE;
#endif
#ifdef FEAT_AUTOCMD
--- 4445,4451 ----
}
#endif
! #if (defined(UNIX) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) ||
defined(FEAT_CON_DIALOG))
process_still_running = FALSE;
#endif
#ifdef FEAT_AUTOCMD
***************
*** 4497,4509 ****
name == NULL
? (char_u *)_("Swap file already
exists!")
: name,
! # if defined(UNIX) || defined(__EMX__) || defined(VMS)
process_still_running
? (char_u *)_("&Open Read-Only\n&Edit
anyway\n&Recover\n&Quit\n&Abort") :
# endif
(char_u *)_("&Open Read-Only\n&Edit
anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE);
! # if defined(UNIX) || defined(__EMX__) || defined(VMS)
if (process_still_running && choice >= 4)
choice++; /* Skip missing "Delete it" button */
# endif
--- 4497,4509 ----
name == NULL
? (char_u *)_("Swap file already
exists!")
: name,
! # if defined(UNIX) || defined(VMS)
process_still_running
? (char_u *)_("&Open Read-Only\n&Edit
anyway\n&Recover\n&Quit\n&Abort") :
# endif
(char_u *)_("&Open Read-Only\n&Edit
anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE);
! # if defined(UNIX) || defined(VMS)
if (process_still_running && choice >= 4)
choice++; /* Skip missing "Delete it" button */
# endif
*** ../vim-7.4.2047/src/misc1.c 2016-07-07 14:29:05.965872369 +0200
--- src/misc1.c 2016-07-16 14:33:33.459016132 +0200
***************
*** 11135,11151 ****
{
if (count <= 0 || files == NULL)
return;
- #if defined(__EMX__) && defined(__ALWAYS_HAS_TRAILING_NULL_POINTER) /* XXX */
- /*
- * Is this still OK for when other functions than expand_wildcards() have
- * been used???
- */
- _fnexplodefree((char **)files);
- #else
while (count--)
vim_free(files[count]);
vim_free(files);
- #endif
}
/*
--- 11135,11143 ----
*** ../vim-7.4.2047/src/misc2.c 2016-07-10 22:11:11.870751341 +0200
--- src/misc2.c 2016-07-16 14:33:33.459016132 +0200
***************
*** 851,857 ****
char_u *
alloc_check(unsigned size)
{
! #if !defined(UNIX) && !defined(__EMX__)
if (sizeof(int) == 2 && size > 0x7fff)
{
/* Don't hide this message */
--- 851,857 ----
char_u *
alloc_check(unsigned size)
{
! #if !defined(UNIX)
if (sizeof(int) == 2 && size > 0x7fff)
{
/* Don't hide this message */
*** ../vim-7.4.2047/src/option.c 2016-07-10 17:00:33.317537221 +0200
--- src/option.c 2016-07-16 14:33:33.463016096 +0200
***************
*** 2004,2014 ****
#if defined(AMIGA) || defined(MSWIN)
(char_u *)".,,",
#else
- # if defined(__EMX__)
- (char_u *)".,/emx/include,,",
- # else /* Unix, probably */
(char_u *)".,/usr/include,,",
- # endif
#endif
(char_u *)0L} SCRIPTID_INIT},
#if defined(DYNAMIC_PERL)
--- 2004,2010 ----
***************
*** 2344,2350 ****
{"shellxquote", "sxq", P_STRING|P_VI_DEF|P_SECURE,
(char_u *)&p_sxq, PV_NONE,
{
! #if defined(UNIX) && defined(USE_SYSTEM) && !defined(__EMX__)
(char_u *)"\"",
#else
(char_u *)"",
--- 2340,2346 ----
{"shellxquote", "sxq", P_STRING|P_VI_DEF|P_SECURE,
(char_u *)&p_sxq, PV_NONE,
{
! #if defined(UNIX) && defined(USE_SYSTEM)
(char_u *)"\"",
#else
(char_u *)"",
***************
*** 3184,3192 ****
*/
if (((p = mch_getenv((char_u *)"SHELL")) != NULL && *p != NUL)
#if defined(MSWIN)
- # ifdef __EMX__
- || ((p = mch_getenv((char_u *)"EMXSHELL")) != NULL && *p != NUL)
- # endif
|| ((p = mch_getenv((char_u *)"COMSPEC")) != NULL && *p != NUL)
# ifdef WIN3264
|| ((p = (char_u *)default_shell()) != NULL && *p != NUL)
--- 3180,3185 ----
*** ../vim-7.4.2047/src/option.h 2016-07-13 22:43:47.774233938 +0200
--- src/option.h 2016-07-16 14:33:33.463016096 +0200
***************
*** 21,40 ****
# if defined(WIN3264)
# define DFLT_EFM "%f(%l) : %t%*\\D%n: %m,%*[^\"]\"%f\"%*\\D%l: %m,%f(%l)
: %m,%*[^ ] %f %l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,%f|%l| %m"
# else
! # if defined(__EMX__) /* put most common here (i.e. gcc format) at
front */
! # define DFLT_EFM "%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,%*[^\"]\"%f\"%*\\D%l:
%m,\"%f\"%*\\D%l: %m,%f(%l:%c) : %m,%f|%l| %m"
# else
! # if defined(__QNX__)
! # define DFLT_EFM "%f(%l):%*[^WE]%t%*\\D%n:%m,%f|%l| %m"
! # else
! # ifdef VMS
! # define DFLT_EFM "%A%p^,%C%%CC-%t-%m,%Cat line number %l in file
%f,%f|%l| %m"
! # else /* Unix, probably */
! # ifdef EBCDIC
#define DFLT_EFM "%*[^ ] %*[^ ] %f:%l%*[ ]%m,%*[^\"]\"%f\"%*\\D%l:
%m,\"%f\"%*\\D%l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line
%l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory %*[`']%f',%X%*\\a[%*\\d]:
Leaving directory %*[`']%f',%DMaking %*\\a in %f,%f|%l| %m"
# else
#define DFLT_EFM "%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-G%f:%l:
(Each undeclared identifier is reported only once,%-G%f:%l: for each function
it appears in.),%-GIn file included from %f:%l:%c:,%-GIn file included from
%f:%l:%c\\,,%-GIn file included from %f:%l:%c,%-GIn file included from
%f:%l,%-G%*[ ]from %f:%l:%c,%-G%*[ ]from %f:%l:,%-G%*[ ]from %f:%l\\,,%-G%*[
]from %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ]
%m,%D%*\\a[%*\\d]: Entering directory %*[`']%f',%X%*\\a[%*\\d]: Leaving
directory %*[`']%f',%D%*\\a: Entering directory %*[`']%f',%X%*\\a: Leaving
directory %*[`']%f',%DMaking %*\\a in %f,%f|%l| %m"
- # endif
# endif
# endif
# endif
--- 21,36 ----
# if defined(WIN3264)
# define DFLT_EFM "%f(%l) : %t%*\\D%n: %m,%*[^\"]\"%f\"%*\\D%l: %m,%f(%l)
: %m,%*[^ ] %f %l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,%f|%l| %m"
# else
! # if defined(__QNX__)
! # define DFLT_EFM "%f(%l):%*[^WE]%t%*\\D%n:%m,%f|%l| %m"
# else
! # ifdef VMS
! # define DFLT_EFM "%A%p^,%C%%CC-%t-%m,%Cat line number %l in file
%f,%f|%l| %m"
! # else /* Unix, probably */
! # ifdef EBCDIC
#define DFLT_EFM "%*[^ ] %*[^ ] %f:%l%*[ ]%m,%*[^\"]\"%f\"%*\\D%l:
%m,\"%f\"%*\\D%l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line
%l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory %*[`']%f',%X%*\\a[%*\\d]:
Leaving directory %*[`']%f',%DMaking %*\\a in %f,%f|%l| %m"
# else
#define DFLT_EFM "%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-G%f:%l:
(Each undeclared identifier is reported only once,%-G%f:%l: for each function
it appears in.),%-GIn file included from %f:%l:%c:,%-GIn file included from
%f:%l:%c\\,,%-GIn file included from %f:%l:%c,%-GIn file included from
%f:%l,%-G%*[ ]from %f:%l:%c,%-G%*[ ]from %f:%l:,%-G%*[ ]from %f:%l\\,,%-G%*[
]from %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ]
%m,%D%*\\a[%*\\d]: Entering directory %*[`']%f',%X%*\\a[%*\\d]: Leaving
directory %*[`']%f',%D%*\\a: Entering directory %*[`']%f',%X%*\\a: Leaving
directory %*[`']%f',%DMaking %*\\a in %f,%f|%l| %m"
# endif
# endif
# endif
*** ../vim-7.4.2047/src/os_unix.c 2016-07-01 15:03:43.340452729 +0200
--- src/os_unix.c 2016-07-16 14:33:33.463016096 +0200
***************
*** 211,224 ****
static void catch_int_signal(void);
static void set_signals(void);
static void catch_signals(RETSIGTYPE (*func_deadly)(), RETSIGTYPE
(*func_other)());
- #ifndef __EMX__
static int have_wildcard(int, char_u **);
static int have_dollars(int, char_u **);
- #endif
- #ifndef __EMX__
static int save_patterns(int num_pat, char_u **pat, int *num_file, char_u
***file);
- #endif
#ifndef SIG_ERR
# define SIG_ERR ((RETSIGTYPE (*)())-1)
--- 211,220 ----
***************
*** 226,235 ****
/* volatile because it is used in signal handler sig_winch(). */
static volatile int do_resize = FALSE;
- #ifndef __EMX__
static char_u *extra_shell_arg = NULL;
static int show_shell_mess = TRUE;
- #endif
/* volatile because it is used in signal handler deathtrap(). */
static volatile int deadly_signal = 0; /* The signal we caught */
/* volatile because it is used in signal handler deathtrap(). */
--- 222,229 ----
***************
*** 570,582 ****
long_u
mch_total_mem(int special UNUSED)
{
- # ifdef __EMX__
- return ulimit(3, 0L) >> 10; /* always 32MB? */
- # else
long_u mem = 0;
long_u shiftright = 10; /* how much to shift "mem" right for Kbyte */
! # ifdef HAVE_SYSCTL
int mib[2], physmem;
size_t len;
--- 564,573 ----
long_u
mch_total_mem(int special UNUSED)
{
long_u mem = 0;
long_u shiftright = 10; /* how much to shift "mem" right for Kbyte */
! # ifdef HAVE_SYSCTL
int mib[2], physmem;
size_t len;
***************
*** 586,594 ****
len = sizeof(physmem);
if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0)
mem = (long_u)physmem;
! # endif
! # if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO)
if (mem == 0)
{
struct sysinfo sinfo;
--- 577,585 ----
len = sizeof(physmem);
if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0)
mem = (long_u)physmem;
! # endif
! # if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO)
if (mem == 0)
{
struct sysinfo sinfo;
***************
*** 596,602 ****
/* Linux way of getting amount of RAM available */
if (sysinfo(&sinfo) == 0)
{
! # ifdef HAVE_SYSINFO_MEM_UNIT
/* avoid overflow as much as possible */
while (shiftright > 0 && (sinfo.mem_unit & 1) == 0)
{
--- 587,593 ----
/* Linux way of getting amount of RAM available */
if (sysinfo(&sinfo) == 0)
{
! # ifdef HAVE_SYSINFO_MEM_UNIT
/* avoid overflow as much as possible */
while (shiftright > 0 && (sinfo.mem_unit & 1) == 0)
{
***************
*** 604,617 ****
--shiftright;
}
mem = sinfo.totalram * sinfo.mem_unit;
! # else
mem = sinfo.totalram;
! # endif
}
}
! # endif
! # ifdef HAVE_SYSCONF
if (mem == 0)
{
long pagesize, pagecount;
--- 595,608 ----
--shiftright;
}
mem = sinfo.totalram * sinfo.mem_unit;
! # else
mem = sinfo.totalram;
! # endif
}
}
! # endif
! # ifdef HAVE_SYSCONF
if (mem == 0)
{
long pagesize, pagecount;
***************
*** 630,648 ****
mem = (long_u)pagesize * pagecount;
}
}
! # endif
/* Return the minimum of the physical memory and the user limit, because
* using more than the user limit may cause Vim to be terminated. */
! # if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT)
{
struct rlimit rlp;
if (getrlimit(RLIMIT_DATA, &rlp) == 0
&& rlp.rlim_cur < ((rlim_t)1 << (sizeof(long_u) * 8 - 1))
! # ifdef RLIM_INFINITY
&& rlp.rlim_cur != RLIM_INFINITY
! # endif
&& ((long_u)rlp.rlim_cur >> 10) < (mem >> shiftright)
)
{
--- 621,639 ----
mem = (long_u)pagesize * pagecount;
}
}
! # endif
/* Return the minimum of the physical memory and the user limit, because
* using more than the user limit may cause Vim to be terminated. */
! # if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT)
{
struct rlimit rlp;
if (getrlimit(RLIMIT_DATA, &rlp) == 0
&& rlp.rlim_cur < ((rlim_t)1 << (sizeof(long_u) * 8 - 1))
! # ifdef RLIM_INFINITY
&& rlp.rlim_cur != RLIM_INFINITY
! # endif
&& ((long_u)rlp.rlim_cur >> 10) < (mem >> shiftright)
)
{
***************
*** 650,661 ****
shiftright = 10;
}
}
! # endif
if (mem > 0)
return mem >> shiftright;
return (long_u)0x1fffff;
- # endif
}
#endif
--- 641,651 ----
shiftright = 10;
}
}
! # endif
if (mem > 0)
return mem >> shiftright;
return (long_u)0x1fffff;
}
#endif
***************
*** 712,720 ****
# ifndef HAVE_SELECT
poll(NULL, 0, (int)msec);
# else
- # ifdef __EMX__
- _sleep2(msec);
- # else
{
struct timeval tv;
--- 702,707 ----
***************
*** 726,732 ****
*/
select(0, NULL, NULL, NULL, &tv);
}
- # endif /* __EMX__ */
# endif /* HAVE_SELECT */
# endif /* HAVE_NANOSLEEP */
#endif /* HAVE_USLEEP */
--- 713,718 ----
***************
*** 2608,2624 ****
int
mch_isFullName(char_u *fname)
{
! #ifdef __EMX__
! return _fnisabs(fname);
! #else
! # ifdef VMS
return ( fname[0] == '/' || fname[0] == '.' ||
strchr((char *)fname,':') || strchr((char *)fname,'"') ||
(strchr((char *)fname,'[') && strchr((char *)fname,']'))||
(strchr((char *)fname,'<') && strchr((char *)fname,'>')) );
! # else
return (*fname == '/' || *fname == '~');
- # endif
#endif
}
--- 2594,2606 ----
int
mch_isFullName(char_u *fname)
{
! #ifdef VMS
return ( fname[0] == '/' || fname[0] == '.' ||
strchr((char *)fname,':') || strchr((char *)fname,'"') ||
(strchr((char *)fname,'[') && strchr((char *)fname,']'))||
(strchr((char *)fname,'<') && strchr((char *)fname,'>')) );
! #else
return (*fname == '/' || *fname == '~');
#endif
}
***************
*** 3840,3858 ****
char_u *p;
/*
- * For OS/2 use _scrsize().
- */
- # ifdef __EMX__
- {
- int s[2];
-
- _scrsize(s);
- columns = s[0];
- rows = s[1];
- }
- # endif
-
- /*
* 1. try using an ioctl. It is the most accurate method.
*
* Try using TIOCGWINSZ first, some systems that have it also define
--- 3822,3827 ----
***************
*** 4102,4110 ****
int tmode = cur_tmode;
#ifdef USE_SYSTEM /* use system() to start the shell: simple but slow */
int x;
- # ifndef __EMX__
- char_u *newcmd; /* only needed for unix */
- # else
/*
* Set the preferred shell in the EMXSHELL environment variable (but
* only if it is different from what is already in the environment).
--- 4071,4076 ----
***************
*** 4125,4131 ****
putenv((char *)p); /* don't free the pointer! */
}
}
- # endif
out_flush();
--- 4091,4096 ----
***************
*** 4137,4160 ****
loose_clipboard();
# endif
- # ifdef __EMX__
- if (cmd == NULL)
- x = system(""); /* this starts an interactive shell in emx */
- else
- x = system((char *)cmd);
- /* system() returns -1 when error occurs in starting shell */
- if (x == -1 && !emsg_silent)
- {
- MSG_PUTS(_("\nCannot execute shell "));
- msg_outtrans(p_sh);
- msg_putchar('\n');
- }
- # else /* not __EMX__ */
if (cmd == NULL)
x = system((char *)p_sh);
else
{
! # ifdef VMS
if (ofn = strchr((char *)cmd, '>'))
*ofn++ = '\0';
if (ifn = strchr((char *)cmd, '<'))
--- 4102,4112 ----
loose_clipboard();
# endif
if (cmd == NULL)
x = system((char *)p_sh);
else
{
! # ifdef VMS
if (ofn = strchr((char *)cmd, '>'))
*ofn++ = '\0';
if (ifn = strchr((char *)cmd, '<'))
***************
*** 4170,4176 ****
x = vms_sys((char *)cmd, ofn, ifn);
else
x = system((char *)cmd);
! # else
newcmd = lalloc(STRLEN(p_sh)
+ (extra_shell_arg == NULL ? 0 : STRLEN(extra_shell_arg))
+ STRLEN(p_shcf) + STRLEN(cmd) + 4, TRUE);
--- 4122,4128 ----
x = vms_sys((char *)cmd, ofn, ifn);
else
x = system((char *)cmd);
! # else
newcmd = lalloc(STRLEN(p_sh)
+ (extra_shell_arg == NULL ? 0 : STRLEN(extra_shell_arg))
+ STRLEN(p_shcf) + STRLEN(cmd) + 4, TRUE);
***************
*** 4185,4191 ****
x = system((char *)newcmd);
vim_free(newcmd);
}
! # endif
}
# ifdef VMS
x = vms_sys_status(x);
--- 4137,4143 ----
x = system((char *)newcmd);
vim_free(newcmd);
}
! # endif
}
# ifdef VMS
x = vms_sys_status(x);
***************
*** 4194,4200 ****
;
else if (x == 127)
MSG_PUTS(_("\nCannot execute shell sh\n"));
- # endif /* __EMX__ */
else if (x && !(options & SHELL_SILENT))
{
MSG_PUTS(_("\nshell returned "));
--- 4146,4151 ----
***************
*** 5742,5753 ****
mzquantum_used = TRUE;
}
# endif
- # ifdef __EMX__
- /* don't check for incoming chars if not in raw mode, because select()
- * always returns TRUE then (in some version of emx.dll) */
- if (curr_tmode != TMODE_RAW)
- return 0;
- # endif
if (towait >= 0)
{
--- 5693,5698 ----
***************
*** 5975,6095 ****
size_t len;
char_u *p;
int dir;
- #ifdef __EMX__
- /*
- * This is the OS/2 implementation.
- */
- # define EXPL_ALLOC_INC 16
- char_u **expl_files;
- size_t files_alloced, files_free;
- char_u *buf;
- int has_wildcard;
-
- *num_file = 0; /* default: no files found */
- files_alloced = EXPL_ALLOC_INC; /* how much space is allocated */
- files_free = EXPL_ALLOC_INC; /* how much space is not used */
- *file = (char_u **)alloc(sizeof(char_u **) * files_alloced);
- if (*file == NULL)
- return FAIL;
-
- for (; num_pat > 0; num_pat--, pat++)
- {
- expl_files = NULL;
- if (vim_strchr(*pat, '$') || vim_strchr(*pat, '~'))
- /* expand environment var or home dir */
- buf = expand_env_save(*pat);
- else
- buf = vim_strsave(*pat);
- expl_files = NULL;
- has_wildcard = mch_has_exp_wildcard(buf); /* (still) wildcards? */
- if (has_wildcard) /* yes, so expand them */
- expl_files = (char_u **)_fnexplode(buf);
-
- /*
- * return value of buf if no wildcards left,
- * OR if no match AND EW_NOTFOUND is set.
- */
- if ((!has_wildcard && ((flags & EW_NOTFOUND) || mch_getperm(buf) >= 0))
- || (expl_files == NULL && (flags & EW_NOTFOUND)))
- { /* simply save the current contents of *buf */
- expl_files = (char_u **)alloc(sizeof(char_u **) * 2);
- if (expl_files != NULL)
- {
- expl_files[0] = vim_strsave(buf);
- expl_files[1] = NULL;
- }
- }
- vim_free(buf);
-
- /*
- * Count number of names resulting from expansion,
- * At the same time add a backslash to the end of names that happen to
- * be directories, and replace slashes with backslashes.
- */
- if (expl_files)
- {
- for (i = 0; (p = expl_files[i]) != NULL; i++)
- {
- dir = mch_isdir(p);
- /* If we don't want dirs and this is one, skip it */
- if ((dir && !(flags & EW_DIR)) || (!dir && !(flags & EW_FILE)))
- continue;
-
- /* Skip files that are not executable if we check for that. */
- if (!dir && (flags & EW_EXEC)
- && !mch_can_exe(p, NULL, !(flags & EW_SHELLCMD)))
- continue;
-
- if (--files_free == 0)
- {
- /* need more room in table of pointers */
- files_alloced += EXPL_ALLOC_INC;
- *file = (char_u **)vim_realloc(*file,
- sizeof(char_u **) * files_alloced);
- if (*file == NULL)
- {
- EMSG(_(e_outofmem));
- *num_file = 0;
- return FAIL;
- }
- files_free = EXPL_ALLOC_INC;
- }
- slash_adjust(p);
- if (dir)
- {
- /* For a directory we add a '/', unless it's already
- * there. */
- len = STRLEN(p);
- if (((*file)[*num_file] = alloc(len + 2)) != NULL)
- {
- STRCPY((*file)[*num_file], p);
- if (!after_pathsep((*file)[*num_file],
- (*file)[*num_file] + len))
- {
- (*file)[*num_file][len] = psepc;
- (*file)[*num_file][len + 1] = NUL;
- }
- }
- }
- else
- {
- (*file)[*num_file] = vim_strsave(p);
- }
- /*
- * Error message already given by either alloc or vim_strsave.
- * Should return FAIL, but returning OK works also.
- */
- if ((*file)[*num_file] == NULL)
- break;
- (*num_file)++;
- }
- _fnexplodefree((char **)expl_files);
- }
- }
- return OK;
-
- #else /* __EMX__ */
/*
* This is the non-OS/2 implementation (really Unix).
*/
--- 5920,5926 ----
***************
*** 6566,6578 ****
if (flags & EW_NOTFOUND)
return save_patterns(num_pat, pat, num_file, file);
return FAIL;
-
- #endif /* __EMX__ */
}
#endif /* VMS */
- #ifndef __EMX__
static int
save_patterns(
int num_pat,
--- 6397,6406 ----
***************
*** 6598,6604 ****
*num_file = num_pat;
return OK;
}
- #endif
/*
* Return TRUE if the string "p" contains a wildcard that mch_expandpath() can
--- 6426,6431 ----
***************
*** 6649,6655 ****
return FALSE;
}
- #ifndef __EMX__
static int
have_wildcard(int num, char_u **file)
{
--- 6476,6481 ----
***************
*** 6671,6677 ****
return TRUE;
return FALSE;
}
- #endif /* ifndef __EMX__ */
#if !defined(HAVE_RENAME) || defined(PROTO)
/*
--- 6497,6502 ----
*** ../vim-7.4.2047/src/os_unix.h 2016-01-29 23:20:35.313308119 +0100
--- src/os_unix.h 2016-07-16 14:33:33.463016096 +0200
***************
*** 33,42 ****
# include <stdlib.h>
#endif
- #ifdef __EMX__
- # define HAVE_TOTAL_MEM
- #endif
-
#if defined(__CYGWIN__) || defined(__CYGWIN32__)
# define WIN32UNIX /* Compiling for Win32 using Unix files. */
# define BINARY_FILE_IO
--- 33,38 ----
*** ../vim-7.4.2047/src/proto.h 2016-07-02 20:27:29.953436359 +0200
--- src/proto.h 2016-07-16 14:33:33.467016060 +0200
***************
*** 35,41 ****
# ifdef AMIGA
# include "os_amiga.pro"
# endif
! # if defined(UNIX) || defined(__EMX__) || defined(VMS)
# include "os_unix.pro"
# endif
# ifdef WIN3264
--- 35,41 ----
# ifdef AMIGA
# include "os_amiga.pro"
# endif
! # if defined(UNIX) || defined(VMS)
# include "os_unix.pro"
# endif
# ifdef WIN3264
*** ../vim-7.4.2047/src/term.c 2016-07-10 22:11:11.874751282 +0200
--- src/term.c 2016-07-16 14:33:33.467016060 +0200
***************
*** 395,401 ****
{K_RIGHT, "\033[C"},
# endif
! # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) ||
defined(SOME_BUILTIN_TCAPS) || defined(__EMX__)
/*
* standard ANSI terminal, default for unix
*/
--- 395,401 ----
{K_RIGHT, "\033[C"},
# endif
! # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) ||
defined(SOME_BUILTIN_TCAPS)
/*
* standard ANSI terminal, default for unix
*/
***************
*** 431,450 ****
# endif
# endif
! # if defined(ALL_BUILTIN_TCAPS) || defined(__EMX__)
/*
* These codes are valid when nansi.sys or equivalent has been installed.
* Function keys on a PC are preceded with a NUL. These are converted into
* K_NUL '\316' in mch_inchar(), because we cannot handle NULs in key codes.
* CTRL-arrow is used instead of SHIFT-arrow.
*/
- #ifdef __EMX__
- {(int)KS_NAME, "os2ansi"},
- #else
{(int)KS_NAME, "pcansi"},
{(int)KS_DL, "\033[M"},
{(int)KS_AL, "\033[L"},
- #endif
{(int)KS_CE, "\033[K"},
{(int)KS_CL, "\033[2J"},
{(int)KS_ME, "\033[0m"},
--- 431,446 ----
# endif
# endif
! # if defined(ALL_BUILTIN_TCAPS)
/*
* These codes are valid when nansi.sys or equivalent has been installed.
* Function keys on a PC are preceded with a NUL. These are converted into
* K_NUL '\316' in mch_inchar(), because we cannot handle NULs in key codes.
* CTRL-arrow is used instead of SHIFT-arrow.
*/
{(int)KS_NAME, "pcansi"},
{(int)KS_DL, "\033[M"},
{(int)KS_AL, "\033[L"},
{(int)KS_CE, "\033[K"},
{(int)KS_CL, "\033[2J"},
{(int)KS_ME, "\033[0m"},
***************
*** 516,522 ****
{K_PAGEUP, "\316I"},
# endif
! # if defined(WIN3264) || defined(ALL_BUILTIN_TCAPS) || defined(__EMX__)
/*
* These codes are valid for the Win32 Console . The entries that start with
* ESC | are translated into console calls in os_win32.c. The function keys
--- 512,518 ----
{K_PAGEUP, "\316I"},
# endif
! # if defined(WIN3264) || defined(ALL_BUILTIN_TCAPS)
/*
* These codes are valid for the Win32 Console . The entries that start with
* ESC | are translated into console calls in os_win32.c. The function keys
***************
*** 793,799 ****
# endif
# endif
! # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) ||
defined(SOME_BUILTIN_TCAPS) || defined(__EMX__)
{(int)KS_NAME, "xterm"},
{(int)KS_CE, IF_EB("\033[K", ESC_STR "[K")},
{(int)KS_AL, IF_EB("\033[L", ESC_STR "[L")},
--- 789,795 ----
# endif
# endif
! # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) ||
defined(SOME_BUILTIN_TCAPS)
{(int)KS_NAME, "xterm"},
{(int)KS_CE, IF_EB("\033[K", ESC_STR "[K")},
{(int)KS_AL, IF_EB("\033[L", ESC_STR "[L")},
***************
*** 1312,1321 ****
# define DEFAULT_TERM (char_u *)"vt52"
#endif
- #ifdef __EMX__
- # define DEFAULT_TERM (char_u *)"os2ansi"
- #endif
-
#ifdef VMS
# define DEFAULT_TERM (char_u *)"vt320"
#endif
--- 1308,1313 ----
***************
*** 2094,2100 ****
}
#endif /* HAVE_TGETENT */
! #if defined(HAVE_TGETENT) && (defined(UNIX) || defined(__EMX__) ||
defined(VMS) || defined(MACOS_X))
/*
* Get Columns and Rows from the termcap. Used after a window signal if the
* ioctl() fails. It doesn't make sense to call tgetent each time if the "co"
--- 2086,2092 ----
}
#endif /* HAVE_TGETENT */
! #if defined(HAVE_TGETENT) && (defined(UNIX) || defined(VMS) ||
defined(MACOS_X))
/*
* Get Columns and Rows from the termcap. Used after a window signal if the
* ioctl() fails. It doesn't make sense to call tgetent each time if the "co"
***************
*** 2398,2408 ****
/*
* the number of calls to ui_write is reduced by using the buffer "out_buf"
*/
! #ifdef DOS16
! # define OUT_SIZE 255 /* only have 640K total... */
! #else
! # define OUT_SIZE 2047
! #endif
/* Add one to allow mch_write() in os_win32.c to append a NUL */
static char_u out_buf[OUT_SIZE + 1];
static int out_pos = 0; /* number of chars in out_buf */
--- 2390,2396 ----
/*
* the number of calls to ui_write is reduced by using the buffer "out_buf"
*/
! #define OUT_SIZE 2047
/* Add one to allow mch_write() in os_win32.c to append a NUL */
static char_u out_buf[OUT_SIZE + 1];
static int out_pos = 0; /* number of chars in out_buf */
*** ../vim-7.4.2047/src/undo.c 2016-07-01 17:17:13.298266645 +0200
--- src/undo.c 2016-07-16 14:33:33.467016060 +0200
***************
*** 641,647 ****
u_getbot();
}
! #if !defined(UNIX) && !defined(WIN32) && !defined(__EMX__)
/*
* With Amiga we can't handle big undo's, because
* then u_alloc_line would have to allocate a block larger than 32K
--- 641,647 ----
u_getbot();
}
! #if !defined(UNIX) && !defined(WIN32)
/*
* With Amiga we can't handle big undo's, because
* then u_alloc_line would have to allocate a block larger than 32K
*** ../vim-7.4.2047/src/version.c 2016-07-16 14:20:39.875128361 +0200
--- src/version.c 2016-07-16 14:33:33.467016060 +0200
***************
*** 580,586 ****
"-syntax",
#endif
/* only interesting on Unix systems */
! #if defined(USE_SYSTEM) && (defined(UNIX) || defined(__EMX__))
"+system()",
#endif
#ifdef FEAT_TAG_BINS
--- 580,586 ----
"-syntax",
#endif
/* only interesting on Unix systems */
! #if defined(USE_SYSTEM) && defined(UNIX)
"+system()",
#endif
#ifdef FEAT_TAG_BINS
***************
*** 612,619 ****
#else
"-termguicolors",
#endif
! #if defined(UNIX) || defined(__EMX__)
! /* only Unix (or OS/2 with EMX!) can have terminfo instead of termcap */
# ifdef TERMINFO
"+terminfo",
# else
--- 612,619 ----
#else
"-termguicolors",
#endif
! #if defined(UNIX)
! /* only Unix can have terminfo instead of termcap */
# ifdef TERMINFO
"+terminfo",
# else
***************
*** 759,764 ****
--- 759,766 ----
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2048,
+ /**/
2047,
/**/
2046,
*** ../vim-7.4.2047/src/vim.h 2016-07-10 17:00:33.317537221 +0200
--- src/vim.h 2016-07-16 14:33:33.467016060 +0200
***************
*** 9,15 ****
#ifndef VIM__H
# define VIM__H
! /* use fastcall for Borland, when compiling for Win32 (not for DOS16) */
#if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
#if defined(FEAT_PERL) || \
defined(FEAT_PYTHON) || \
--- 9,15 ----
#ifndef VIM__H
# define VIM__H
! /* use fastcall for Borland, when compiling for Win32 */
#if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
#if defined(FEAT_PERL) || \
defined(FEAT_PYTHON) || \
***************
*** 27,33 ****
# endif
#endif
! #if defined(WIN32) || defined(_WIN64) || defined(__EMX__)
# include "vimio.h"
#endif
--- 27,33 ----
# endif
#endif
! #if defined(WIN32) || defined(_WIN64)
# include "vimio.h"
#endif
***************
*** 84,93 ****
# define ROOT_UID 0
#endif
- #ifdef __EMX__ /* hand-edited config.h for OS/2 with EMX */
- # include "os_os2_cfg.h"
- #endif
-
/*
* MACOS_CLASSIC compiling for MacOS prior to MacOS X
* MACOS_X_UNIX compiling for MacOS X (using os_unix.c)
--- 84,89 ----
***************
*** 252,258 ****
# include "os_beos.h"
#endif
! #if (defined(UNIX) || defined(__EMX__) || defined(VMS)) \
&& (!defined(MACOS_X) || defined(HAVE_CONFIG_H))
# include "os_unix.h" /* bring lots of system header files */
#endif
--- 248,254 ----
# include "os_beos.h"
#endif
! #if (defined(UNIX) || defined(VMS)) \
&& (!defined(MACOS_X) || defined(HAVE_CONFIG_H))
# include "os_unix.h" /* bring lots of system header files */
#endif
***************
*** 277,288 ****
# include "auto/osdef.h" /* bring missing declarations in */
#endif
- #ifdef __EMX__
- # define getcwd _getcwd2
- # define chdir _chdir2
- # undef CHECK_INODE
- #endif
-
#ifdef AMIGA
# include "os_amiga.h"
#endif
--- 273,278 ----
***************
*** 477,483 ****
#endif
#if defined(HAVE_ERRNO_H) \
! || defined(WIN32) || defined(_WIN64) || defined(__EMX__)
# include <errno.h>
#endif
--- 467,473 ----
#endif
#if defined(HAVE_ERRNO_H) \
! || defined(WIN32) || defined(_WIN64)
# include <errno.h>
#endif
***************
*** 1530,1536 ****
* EMX doesn't have a global way of making open() use binary I/O.
* Use O_BINARY for all open() calls.
*/
! #if defined(__EMX__) || defined(__CYGWIN32__)
# define O_EXTRA O_BINARY
#else
# define O_EXTRA 0
--- 1520,1526 ----
* EMX doesn't have a global way of making open() use binary I/O.
* Use O_BINARY for all open() calls.
*/
! #if defined(__CYGWIN32__)
# define O_EXTRA O_BINARY
#else
# define O_EXTRA 0
*** ../vim-7.4.2047/src/xxd/xxd.c 2016-01-30 21:29:52.232928463 +0100
--- src/xxd/xxd.c 2016-07-16 14:33:33.471016023 +0200
***************
*** 80,93 ****
#else
# include <fcntl.h>
#endif
! #ifdef __TSC__
! # define MSDOS
! #endif
! #if !defined(OS2) && defined(__EMX__)
! # define OS2
! #endif
! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__)
\
! || defined(CYGWIN)
# include <io.h> /* for setmode() */
#else
# ifdef UNIX
--- 80,86 ----
#else
# include <fcntl.h>
#endif
! #if defined(WIN32) || defined(__BORLANDC__) || defined(CYGWIN)
# include <io.h> /* for setmode() */
#else
# ifdef UNIX
***************
*** 149,166 ****
#ifdef WIN32
char osver[] = " (Win32)";
#else
- # ifdef DJGPP
- char osver[] = " (dos 32 bit)";
- # else
- # ifdef MSDOS
- char osver[] = " (dos 16 bit)";
- # else
char osver[] = "";
- # endif
- # endif
#endif
! #if defined(MSDOS) || defined(WIN32) || defined(OS2)
# define BIN_READ(yes) ((yes) ? "rb" : "rt")
# define BIN_WRITE(yes) ((yes) ? "wb" : "wt")
# define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT)
--- 142,151 ----
#ifdef WIN32
char osver[] = " (Win32)";
#else
char osver[] = "";
#endif
! #if defined(WIN32)
# define BIN_READ(yes) ((yes) ? "rb" : "rt")
# define BIN_WRITE(yes) ((yes) ? "wb" : "wt")
# define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT)
***************
*** 203,210 ****
#endif
#ifndef __P
! # if defined(__STDC__) || defined(MSDOS) || defined(WIN32) || defined(OS2) \
! || defined(__BORLANDC__)
# define __P(a) a
# else
# define __P(a) ()
--- 188,194 ----
#endif
#ifndef __P
! # if defined(__STDC__) || defined(WIN32) || defined(__BORLANDC__)
# define __P(a) a
# else
# define __P(a) ()
*** ../vim-7.4.2047/src/version.c 2016-07-16 14:20:39.875128361 +0200
--- src/version.c 2016-07-16 14:33:33.467016060 +0200
***************
*** 581,585 ****
#endif
/* only interesting on Unix systems */
! #if defined(USE_SYSTEM) && (defined(UNIX) || defined(__EMX__))
"+system()",
#endif
--- 581,585 ----
#endif
/* only interesting on Unix systems */
! #if defined(USE_SYSTEM) && defined(UNIX)
"+system()",
#endif
***************
*** 613,618 ****
"-termguicolors",
#endif
! #if defined(UNIX) || defined(__EMX__)
! /* only Unix (or OS/2 with EMX!) can have terminfo instead of termcap */
# ifdef TERMINFO
"+terminfo",
--- 613,618 ----
"-termguicolors",
#endif
! #if defined(UNIX)
! /* only Unix can have terminfo instead of termcap */
# ifdef TERMINFO
"+terminfo",
***************
*** 760,761 ****
--- 760,763 ----
{ /* Add new patch number below this line */
+ /**/
+ 2048,
/**/
--
You had connectors? Eeee, when I were a lad we 'ad to carry the
bits between the computer and the terminal with a spoon...
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
