diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds.c | 8 | ||||
| -rw-r--r-- | src/nvim/ex_docmd.c | 3 | ||||
| -rw-r--r-- | src/nvim/main.c | 13 | ||||
| -rw-r--r-- | src/nvim/mbyte.c | 6 | ||||
| -rw-r--r-- | src/nvim/os_unix.c | 1 | ||||
| -rw-r--r-- | src/nvim/path.c | 2 | ||||
| -rw-r--r-- | src/nvim/term.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test17.in | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test30.in | 7 |
9 files changed, 9 insertions, 37 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index d849d87b19..a8d2f5589e 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -1294,14 +1294,6 @@ do_shell ( } starttermcap(); /* start termcap if not done by wait_return() */ - - /* - * In an Amiga window redrawing is caused by asking the window size. - * If we got an interrupt this will not work. The chance that the - * window size is wrong is very small, but we need to redraw the - * screen. Don't do this if ':' hit in wait_return(). THIS IS UGLY - * but it saves an extra redraw. - */ } /* display any error messages now */ diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 5719621882..f25af3f587 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -5141,8 +5141,7 @@ static void ex_quit(exarg_T *eap) */ static void ex_cquit(exarg_T *eap) { - getout(1); /* this does not always pass on the exit code to the Manx - compiler. why? */ + getout(1); } /* diff --git a/src/nvim/main.c b/src/nvim/main.c index 23c48651b1..1f6c8ddc81 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -208,9 +208,6 @@ int main(int argc, char **argv) /* * Check if we have an interactive window. - * On the Amiga: If there is no window, we open one with a newcli command - * (needed for :! to * work). mch_check_win() will also handle the -d or - * -dev argument. */ check_and_set_isatty(¶ms); @@ -1087,8 +1084,7 @@ static void command_line_scan(mparm_T *parmp) exmode_active = EXMODE_VIM; break; - case 'f': /* "-f" GUI: run in foreground. Amiga: open - window directly, not with newcli */ + case 'f': /* "-f" GUI: run in foreground. */ break; case 'g': /* "-g" start GUI */ @@ -1489,9 +1485,6 @@ static void init_startuptime(mparm_T *paramp) /* * Check if we have an interactive window. - * On the Amiga: If there is no window, we open one with a newcli command - * (needed for :! to * work). mch_check_win() will also handle the -d or - * -dev argument. */ static void check_and_set_isatty(mparm_T *paramp) { @@ -1957,10 +1950,10 @@ static void source_startup_scripts(mparm_T *parmp) /* * Try to read initialization commands from the following places: * - environment variable VIMINIT - * - user vimrc file (s:.vimrc for Amiga, ~/.vimrc otherwise) + * - user vimrc file (~/.vimrc) * - second user vimrc file ($VIM/.vimrc for Dos) * - environment variable EXINIT - * - user exrc file (s:.exrc for Amiga, ~/.exrc otherwise) + * - user exrc file (~/.exrc) * - second user exrc file ($VIM/.exrc for Dos) * The first that exists is used, the rest is ignored. */ diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 429fbc7427..26eda01f98 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -289,11 +289,9 @@ enc_canon_table[] = #define IDX_MACROMAN 57 {"macroman", ENC_8BIT + ENC_MACROMAN, 0}, /* Mac OS */ -#define IDX_DECMCS 58 - {"dec-mcs", ENC_8BIT, 0}, /* DEC MCS */ -#define IDX_HPROMAN8 59 +#define IDX_HPROMAN8 58 {"hp-roman8", ENC_8BIT, 0}, /* HP Roman8 */ -#define IDX_COUNT 60 +#define IDX_COUNT 59 }; /* diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 612f475933..c8f09f9231 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -1,6 +1,5 @@ /* * VIM - Vi IMproved by Bram Moolenaar - * VMS merge by Zoltan Arpadffy * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. diff --git a/src/nvim/path.c b/src/nvim/path.c index 950cc5a83a..8af4015611 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -179,7 +179,7 @@ char_u *path_next_component(char_u *fname) /* * Get a pointer to one character past the head of a path name. - * Unix: after "/"; DOS: after "c:\"; Amiga: after "disk:/"; Mac: no head. + * Unix: after "/"; DOS: after "c:\"; Mac: no head. * If there is no head, path is returned. */ char_u *get_past_head(char_u *path) diff --git a/src/nvim/term.c b/src/nvim/term.c index 24969bf90f..ceec140670 100644 --- a/src/nvim/term.c +++ b/src/nvim/term.c @@ -80,7 +80,7 @@ * * The entries are compact, therefore they normally are included even when * HAVE_TGETENT is defined. When HAVE_TGETENT is defined, the builtin entries - * can be accessed with "builtin_amiga", "builtin_ansi", "builtin_debug", etc. + * can be accessed with "builtin_ansi", "builtin_debug", etc. * * Each termcap is a list of builtin_term structures. It always starts with * KS_NAME, which separates the entries. See parse_builtin_tcap() for all diff --git a/src/nvim/testdir/test17.in b/src/nvim/testdir/test17.in index 64534ec77c..7fef87d383 100644 --- a/src/nvim/testdir/test17.in +++ b/src/nvim/testdir/test17.in @@ -16,11 +16,7 @@ STARTTEST :let $CDIR = "." /CDIR :else -:if has("amiga") -:let $TDIR = "/testdir" -:else :let $TDIR = "." -:endif /TDIR :endif :" Dummy writing for making that sure gf doesn't fail even if the current diff --git a/src/nvim/testdir/test30.in b/src/nvim/testdir/test30.in index 4a8778d2de..3f7b9eb472 100644 --- a/src/nvim/testdir/test30.in +++ b/src/nvim/testdir/test30.in @@ -24,12 +24,7 @@ STARTTEST :set nobin eol :bwipe XXUnix XXDos XXMac :" create mixed format files -:if has("vms") -: !copy XXUnix,XXDos XXUxDs. -: !copy XXUnix,XXMac XXUxMac. -: !copy XXDos,XXMac XXDosMac. -: !copy XXUnix,XXDos,XXMac XXUxDsMc. -:elseif has("win32") +:if has("win32") : !copy /b XXUnix+XXDos XXUxDs : !copy /b XXUnix+XXMac XXUxMac : !copy /b XXDos+XXMac XXDosMac |