Remove Amiga remnants

Notes regarding the removal of specific items:

  - Aztec C: only on the Amiga.
  - mch_check_win(): doesn't exist anymore.
  - Comment in ex_cmds.c: It seems the context for this comment was
    removed, but the comment was inadvertantly left alone.

30 files changed, 108 insertions, 359 deletions

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 9f8e0acccd..cf7f183e54 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -528,8 +528,7 @@ CursorHold			When the user doesn't press a key for the time
 				Hint: to force an update of the status lines
 				use: >
 					:let &ro = &ro
-<				{only on Amiga, Unix, Win32, MSDOS and all GUI
-				versions}
+
 							*CursorHoldI*
 CursorHoldI			Just like CursorHold, but in Insert mode.
 
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index a6a2da61bf..9f925d6e58 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -407,8 +407,7 @@ CTRL-N		After using 'wildchar' which got multiple matches, go to next
 <S-Tab>							*c_CTRL-P* *c_<S-Tab>*
 CTRL-P		After using 'wildchar' which got multiple matches, go to
 		previous match.  Otherwise recall older command-line from
-		history.  <S-Tab> only works with the GUI, on the Amiga and
-		with MS-DOS.
+		history.  <S-Tab> only works with the GUI and with MS-DOS.
 							*c_CTRL-A*
 CTRL-A		All names that match the pattern in front of the cursor are
 		inserted.
@@ -587,10 +586,9 @@ When the character '%' or '#' is used where a file name is expected, they are
 expanded to the current and alternate file name (see the chapter "editing
 files" |:_%| |:_#|).
 
-Embedded spaces in file names are allowed on the Amiga if one file name is
-expected as argument.  Trailing spaces will be ignored, unless escaped with a
-backslash or CTRL-V.  Note that the ":next" command uses spaces to separate
-file names.  Escape the spaces to include them in a file name.  Example: >
+Trailing spaces in filenames will be ignored, unless escaped with a backslash
+or CTRL-V.  Note that the ":next" command uses spaces to separate file names.
+Escape the spaces to include them in a file name.  Example: >
 	:next foo\ bar goes\ to school\
 starts editing the three files "foo bar", "goes to" and "school ".
 
@@ -854,9 +852,9 @@ These modifiers can be given, in this order:
 		separator is removed.  Thus ":p:h" on a directory name results
 		on the directory name itself (without trailing slash).
 		When the file name is an absolute path (starts with "/" for
-		Unix; "x:\" for MS-DOS, WIN32; "drive:" for Amiga), that
-		part is not removed.  When there is no head (path is relative
-		to current directory) the result is empty.
+		Unix; "x:\" for MS-DOS and WIN32), that part is not removed.
+		When there is no head (path is relative to current directory)
+		the result is empty.
 	:t	Tail of the file name (last component of the name).  Must
 		precede any :r or :e.
 	:r	Root of the file name (the last extension removed).  When
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 3496a03921..f2daa9ec24 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -359,10 +359,10 @@ expected are mentioned at |cmdline-special|.
 Note for systems other than Unix: When using a command that accepts a single
 file name (like ":edit file") spaces in the file name are allowed, but
 trailing spaces are ignored.  This is useful on systems that regularly embed
-spaces in file names (like MS-Windows and the Amiga).  Example: The command
-":e   Long File Name " will edit the file "Long File Name".  When using a
-command that accepts more than one file name (like ":next file1 file2")
-embedded spaces must be escaped with a backslash.
+spaces in file names (like MS-Windows).  Example: The command ":e   Long File
+Name " will edit the file "Long File Name".  When using a command that accepts
+more than one file name (like ":next file1 file2") embedded spaces must be
+escaped with a backslash.
 
 						*wildcard* *wildcards*
 Wildcards in {file} are expanded, but as with file completion, 'wildignore'
@@ -510,10 +510,10 @@ characters will be replaced with <CR><NL> (assuming 'fileformats' includes
 If you start editing a new file and the 'fileformats' option is not empty
 (which is the default), Vim will try to detect whether the lines in the file
 are separated by the specified formats.  When set to "unix,dos", Vim will
-check for lines with a single <NL> (as used on Unix and Amiga) or by a <CR>
-<NL> pair (MS-DOS).  Only when ALL lines end in <CR><NL>, 'fileformat' is set
-to "dos", otherwise it is set to "unix".  When 'fileformats' includes "mac",
-and no <NL> characters are found in the file, 'fileformat' is set to "mac".
+check for lines with a single <NL> (as used on Unix) or by a <CR><NL> pair
+(MS-DOS).  Only when ALL lines end in <CR><NL>, 'fileformat' is set to "dos",
+otherwise it is set to "unix".  When 'fileformats' includes "mac", and no <NL>
+characters are found in the file, 'fileformat' is set to "mac".
 
 If the 'fileformat' option is set to "dos" on non-MS-DOS systems the message
 "[dos format]" is shown to remind you that something unusual is happening.  On
@@ -1031,7 +1031,6 @@ and for MS-DOS or MS-Windows: >
 For Unix a device is detected when the name doesn't refer to a normal file or
 a directory.  A fifo or named pipe also looks like a device to Vim.
 For MS-DOS and MS-Windows the device is detected by its name:
-	AUX
 	CON
 	CLOCK$
 	NUL
@@ -1063,8 +1062,7 @@ The names can be in upper- or lowercase.
 			buffers.  Use ":qall!" to exit always.
 
 :cq[uit]		Quit always, without writing, and return an error
-			code.  See |:cq|.  Used for Manx's QuickFix mode (see
-			|quickfix|).  {not in Vi}
+			code.  See |:cq|.  {not in Vi}
 
 							*:wq*
 :wq [++opt]		Write the current file and quit.  Writing fails when
@@ -1316,11 +1314,10 @@ There are a few things to remember when editing binary files:
   split in two.
 - When there are not many <EOL>s, the lines will become very long.  If you
   want to edit a line that does not fit on the screen reset the 'wrap' option.
-  Horizontal scrolling is used then.  If a line becomes too long (more than
-  about 32767 characters on the Amiga, much more on 32-bit systems, see
-  |limits|) you cannot edit that line.  The line will be split when reading
-  the file.  It is also possible that you get an "out of memory" error when
-  reading the file.
+  Horizontal scrolling is used then.  If a line becomes too long (see |limits|)
+  you cannot edit that line.  The line will be split when reading the file.
+  It is also possible that you get an "out of memory" error when reading the
+  file.
 - Make sure the 'binary' option is set BEFORE loading the
   file.  Otherwise both <CR> <NL> and <NL> are considered to end a line
   and when the file is written the <NL> will be replaced with <CR> <NL>.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 99aad26104..2699d4c1b2 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6662,9 +6662,7 @@ There are four types of features:
 
 acl			Compiled with |ACL| support.
 all_builtin_terms	Compiled with all builtin terminals enabled.
-amiga			Amiga version of Vim.
 arabic			Compiled with Arabic support |Arabic|.
-arp			Compiled with ARP support (Amiga).
 autocmd			Compiled with autocommand support. |autocommand|
 balloon_eval		Compiled with |balloon-eval| support.
 balloon_multiline	GUI supports multiline balloons.
@@ -6703,8 +6701,8 @@ filterpipe		When 'shelltemp' is off pipes are used for shell
 find_in_path		Compiled with support for include file searches
 			|+find_in_path|.
 float			Compiled with support for |Float|.
-fname_case		Case in file names matters (for Amiga, MS-DOS, and
-			Windows this is not present).
+fname_case		Case in file names matters (for MS-DOS and Windows
+			this is not present).
 folding			Compiled with |folding| support.
 footer			Compiled with GUI footer support. |gui-footer|
 fork			Compiled to use fork()/exec() instead of system().
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 34c4b79059..6b89529bfe 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -33,7 +33,6 @@ compatible means options are global.  Resetting 'compatible' is recommended,
 if you didn't do that already.
 
 Detail: The ":filetype on" command will load one of these files:
-		Amiga	    $VIMRUNTIME/filetype.vim
 		Mac	    $VIMRUNTIME/filetype.vim
 		MS-DOS	    $VIMRUNTIME\filetype.vim
 		Unix	    $VIMRUNTIME/filetype.vim
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index c174914c54..8166919a51 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -94,8 +94,6 @@ Recommended place for your personal GUI initializations:
 	Unix		    $HOME/.gvimrc or $HOME/.vim/gvimrc
 	MS-DOS and Win32    $HOME/_gvimrc, $HOME/vimfiles/gvimrc
 			    or $VIM/_gvimrc
-	Amiga		    s:.gvimrc, home:.gvimrc, home:vimfiles:gvimrc
-			    or $VIM/.gvimrc
 
 The personal initialization files are searched in the order specified above
 and only the first one that is found is read.
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index a03079c798..2b6c24cecf 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -466,9 +466,7 @@ notation	meaning		    equivalent	decimal value(s)	~
 -----------------------------------------------------------------------
 
 Note: The shifted cursor keys, the help key, and the undo key are only
-available on a few terminals.  On the Amiga, shifted function key 10 produces
-a code (CSI) that is also used by key sequences.  It will be recognized only
-after typing another key.
+available on a few terminals.
 
 Note: There are two codes for the delete key.  127 is the decimal ASCII value
 for the delete key, which is always recognized.  Some delete keys send another
@@ -809,12 +807,11 @@ messages before you have a chance to read them}
 Some commands show how many lines were affected.  Above which threshold this
 happens can be controlled with the 'report' option (default 2).
 
-On the Amiga Vim will run in a CLI window.  The name Vim and the full name of
-the current file name will be shown in the title bar.  When the window is
-resized, Vim will automatically redraw the window.  You may make the window as
-small as you like, but if it gets too small not a single line will fit in it.
-Make it at least 40 characters wide to be able to read most messages on the
-last line.
+The name Vim and the full name of the current file name will be shown in the
+title bar.  When the window is resized, Vim will automatically redraw the
+window.  You may make the window as small as you like, but if it gets too
+small not a single line will fit in it.  Make it at least 40 characters wide
+to be able to read most messages on the last line.
 
 On most Unix systems, resizing the window is recognized and handled correctly
 by Vim.  {Vi: not ok}
diff --git a/runtime/doc/manpages/vim.1 b/runtime/doc/manpages/vim.1
index 59f21e1b9b..aaf05b59be 100644
--- a/runtime/doc/manpages/vim.1
+++ b/runtime/doc/manpages/vim.1
@@ -90,8 +90,7 @@ See ":help tag\-commands".
 Start in quickFix mode.
 The file [errorfile] is read and the first error is displayed.
 If [errorfile] is omitted, the filename is obtained from the 'errorfile'
-option (defaults to "AztecC.Err" for the Amiga, "errors.err" on other
-systems).
+option (defaults to "errors.err").
 Further errors can be jumped to with the ":cn" command.
 See ":help quickfix".
 .PP
@@ -192,12 +191,6 @@ There should be two, three or four file name arguments.
 will open all the files and show differences between them.
 Works like vimdiff(1).
 .TP
-\-d {device}
-Open {device} for use as a terminal.
-Only on the Amiga.
-Example:
-"\-d con:20/30/600/150".
-.TP
 \-D
 Debugging.  Go to debugging mode when executing the first command from a
 script.
@@ -216,14 +209,10 @@ in improved Ex mode, just like the executable was called "exim".
 Foreground.  For the GUI version,
 .B Vim
 will not fork and detach from the shell it was started in.
-On the Amiga,
-.B Vim
-is not restarted to open a new window.
 This option should be used when
 .B Vim
 is executed by a program that will wait for the edit
 session to finish (e.g. mail).
-On the Amiga the ":sh" and ":!" commands will not work.
 .TP
 \-\-nofork
 Foreground.  For the GUI version,
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 1a5df11cdb..39f83ac75d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -986,8 +986,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	again not rename the file.
 
 						*'backupdir'* *'bdir'*
-'backupdir' 'bdir'	string	(default for Amiga: ".,t:",
-				 for MS-DOS and Win32: ".,$TEMP,c:/tmp,c:/temp"
+'backupdir' 'bdir'	string	(default for MS-DOS and Win32: ".,$TEMP,c:/tmp,c:/temp",
 				 for Unix: ".,~/tmp,~/")
 			global
 			{not in Vi}
@@ -2455,8 +2454,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	NOTE: This option is reset when 'compatible' is set.
 
 						*'directory'* *'dir'*
-'directory' 'dir'	string	(default for Amiga: ".,t:",
-				 for MS-DOS and Win32: ".,$TEMP,c:\tmp,c:\temp"
+'directory' 'dir'	string	(default for MS-DOS and Win32: ".,$TEMP,c:\tmp,c:\temp",
 				 for Unix: ".,~/tmp,/var/tmp,/tmp")
 			global
 	List of directory names for the swap file, separated with commas.
@@ -2655,8 +2653,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	screen flash or do nothing.
 
 						*'errorfile'* *'ef'*
-'errorfile' 'ef'	string	(Amiga default: "AztecC.Err",
-					others: "errors.err")
+'errorfile' 'ef'	string	(default: "errors.err")
 			global
 			{not in Vi}
 			{not available when compiled without the |+quickfix|
@@ -4262,7 +4259,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'isfname'* *'isf'*
 'isfname' 'isf'		string	(default for MS-DOS and Win32:
 			     "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,="
-			    for AMIGA: "@,48-57,/,.,-,_,+,,,$,:"
 			    otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,=")
 			global
 			{not in Vi}
@@ -5676,11 +5672,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						$VIMRUNTIME,
 						$VIM/vimfiles/after,
 						$HOME/.vim/after"
-					Amiga: "home:vimfiles,
-						$VIM/vimfiles,
-						$VIMRUNTIME,
-						$VIM/vimfiles/after,
-						home:vimfiles/after"
 					Macintosh: "$VIM:vimfiles,
 						$VIMRUNTIME,
 						$VIM:vimfiles:after"
@@ -5987,8 +5978,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The name of the temporary file can be represented by "%s" if necessary
 	(the file name is appended automatically if no %s appears in the value
 	of this option).
-	For the Amiga and MS-DOS the default is ">".  The output is directly
-	saved in a file and not echoed to the screen.
+	For MS-DOS the default is ">".  The output is directly saved in a file
+	and not echoed to the screen.
 	For Unix the default it "| tee".  The stdout of the compiler is saved
 	in a file and echoed to the screen.  If the 'shell' option is "csh" or
 	"tcsh" after initializations, the default becomes "|& tee".  If the
@@ -7049,7 +7040,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'term'* *E529* *E530* *E531*
 'term'			string	(default is $TERM, if that fails:
 				      in the GUI: "builtin_gui"
-					on Amiga: "amiga"
 					  on Mac: "mac-ansi"
 				       on MS-DOS: "pcterm"
 					 on Unix: "ansi"
@@ -7235,9 +7225,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 		(path)		is the path of the file being edited
 		- VIM		the server name |v:servername| or "VIM"
 	Only works if the terminal supports setting window titles
-	(currently Amiga console, Win32 console, all GUI versions and
-	terminals with a non- empty 't_ts' option - this is Unix xterm
-	by default, where 't_ts' is taken from the builtin termcap).
+	(currently Win32 console, all GUI versions and terminals with a non-
+	empty 't_ts' option - this is Unix xterm by default, where 't_ts' is
+	taken from the builtin termcap).
 								*X11*
 	When Vim was compiled with HAVE_X11 defined, the original title will
 	be restored if possible.  The output of ":version" will include "+X11"
@@ -7289,8 +7279,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When this option is not empty, it will be used for the title of the
 	window.  This happens only when the 'title' option is on.
 	Only works if the terminal supports setting window titles (currently
-	Amiga console, Win32 console, all GUI versions and terminals with a
-	non-empty 't_ts' option).
+	Win32 console, all GUI versions and terminals with a non-empty 't_ts'
+	option).
 	When Vim was compiled with HAVE_X11 defined, the original title will
 	be restored if possible |X11|.
 	When this option contains printf-style '%' items, they will be
@@ -7584,10 +7574,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	displayed when 'verbosefile' is set.
 
 						*'viewdir'* *'vdir'*
-'viewdir' 'vdir'	string	(default for Amiga, MS-DOS, and Win32:
-							 "$VIM/vimfiles/view",
-				 for Unix: "~/.vim/view",
-				 for Macintosh: "$VIM:vimfiles:view")
+'viewdir' 'vdir'	string	(default for MS-DOS and Win32: "$VIM/vimfiles/view",
+				 for Unix: "~/.vim/view")
 			global
 			{not in Vi}
 			{not available when compiled without the |+mksession|
@@ -7622,7 +7610,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 				*'viminfo'* *'vi'* *E526* *E527* *E528*
 'viminfo' 'vi'		string	(Vi default: "", Vim default for MS-DOS,
 				   Windows: '100,<50,s10,h,rA:,rB:,
-				   for Amiga: '100,<50,s10,h,rdf0:,rdf1:,rdf2:
 				   for others: '100,<50,s10,h)
 			global
 			{not in Vi}
@@ -7704,10 +7691,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 		',').  This parameter can be given several times.  Each
 		specifies the start of a path for which no marks will be
 		stored.  This is to avoid removable media.  For MS-DOS you
-		could use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:".  You can
-		also use it for temp files, e.g., for Unix: "r/tmp".  Case is
-		ignored.  Maximum length of each 'r' argument is 50
-		characters.
+		could use "ra:,rb:".  You can also use it for temp files,
+		e.g., for Unix: "r/tmp".  Case is ignored.  Maximum length of
+		each 'r' argument is 50 characters.
 							*viminfo-s*
 	s	Maximum size of an item in Kbyte.  If zero then registers are
 		not saved.  Currently only applies to registers.  The default
@@ -7775,9 +7761,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	might want to set it again in your |gvimrc|.
 	In the GUI, 't_vb' defaults to "<Esc>|f", which inverts the display
 	for 20 msec.  If you want to use a different time, use "<Esc>|40f",
-	where 40 is the time in msec.
-	Does not work on the Amiga, you always get a screen flash.
-	Also see 'errorbells'.
+	where 40 is the time in msec.  Also see 'errorbells'.
 
 						*'warn'* *'nowarn'*
 'warn'			boolean	(default on)
diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt
index 6273597d27..49f19c6661 100644
--- a/runtime/doc/os_unix.txt
+++ b/runtime/doc/os_unix.txt
@@ -9,10 +9,10 @@ This file contains the particularities for the Unix version of Vim.
 
 For compiling Vim on Unix see "INSTALL" and "Makefile" in the src directory.
 
-The default help file name is "/usr/local/lib/vim/help.txt"
-The files "$HOME/.vimrc" and "$HOME/.exrc" are used instead of "s:.vimrc" and
-"s:.exrc".  Additionally "/usr/local/etc/vimrc" is used first.
-If "/usr/local/share" exists it is used instead of "/usr/local/lib".
+The default help file name is "/usr/local/lib/vim/help.txt" The files
+"$HOME/.vimrc" and "$HOME/.exrc" are used for configuration.  Additionally
+"/usr/local/etc/vimrc" is used first.  If "/usr/local/share" exists it is used
+instead of "/usr/local/lib".
 
 Temporary files (for filtering) are put in "/tmp".  If you want to place them
 somewhere else, set the environment variable $TMPDIR to the directory you
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 6b80482f6b..22a5e41fd1 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -35,12 +35,10 @@ positions in files.  For example, |:vimgrep| finds pattern matches.  You can
 use the positions in a script with the |getqflist()| function.  Thus you can
 do a lot more than the edit/compile/fix cycle!
 
-If you are using Manx's Aztec C compiler on the Amiga look here for how to use
-it with Vim: |quickfix-manx|.  If you are using another compiler you should
-save the error messages in a file and start Vim with "vim -q filename".  An
-easy way to do this is with the |:make| command (see below).  The
-'errorformat' option should be set to match the error messages from your
-compiler (see |errorformat| below).
+You should save your compiler's error messages to a file and start vim with
+"vim -q filename".  An easy way to do this is with the |:make| command (see
+below).  The 'errorformat' option should be set to match the error messages
+from your compiler (see |errorformat| below).
 
 						*location-list* *E776*
 A location list is similar to a quickfix list and contains a list of positions
@@ -501,14 +499,14 @@ or simpler >
 "$*" can be given multiple times, for example: >
    :set makeprg=gcc\ -o\ $*\ $*
 
-The 'shellpipe' option defaults to ">" for the Amiga, MS-DOS and Win32.  This
-means that the output of the compiler is saved in a file and not shown on the
-screen directly.  For Unix "| tee" is used.  The compiler output is shown on
-the screen and saved in a file the same time.  Depending on the shell used
-"|& tee" or "2>&1| tee" is the default, so stderr output will be included.
+The 'shellpipe' option defaults to ">" for MS-DOS and Win32.  This means that
+the output of the compiler is saved in a file and not shown on the screen
+directly.  For Unix "| tee" is used.  The compiler output is shown on the
+screen and saved in a file the same time.  Depending on the shell used "|&
+tee" or "2>&1| tee" is the default, so stderr output will be included.
 
 If 'shellpipe' is empty, the {errorfile} part will be omitted.  This is useful
-for compilers that write to an errorfile themselves (e.g., Manx's Amiga C).
+for compilers that write to an errorfile themselves.
 
 
 Using QuickFixCmdPost to fix the encoding ~
@@ -792,31 +790,6 @@ g:compiler_gcc_ignore_unmatched_lines
 				positives.
 
 
-MANX AZTEC C				*quickfix-manx* *compiler-manx*
-
-To use Vim with Manx's Aztec C compiler on the Amiga you should do the
-following:
-- Set the CCEDIT environment variable with the command: >
-	mset "CCEDIT=vim -q"
-- Compile with the -qf option.  If the compiler finds any errors, Vim is
-  started and the cursor is positioned on the first error.  The error message
-  will be displayed on the last line.  You can go to other errors with the
-  commands mentioned above.  You can fix the errors and write the file(s).
-- If you exit Vim normally the compiler will re-compile the same file.  If you
-  exit with the :cq command, the compiler will terminate.  Do this if you
-  cannot fix the error, or if another file needs to be compiled first.
-
-There are some restrictions to the Quickfix mode on the Amiga.  The
-compiler only writes the first 25 errors to the errorfile (Manx's
-documentation does not say how to get more).  If you want to find the others,
-you will have to fix a few errors and exit the editor.  After recompiling,
-up to 25 remaining errors will be found.
-
-If Vim was started from the compiler, the :sh and some :!  commands will not
-work, because Vim is then running in the same process as the compiler and
-stdin (standard input) will not be interactive.
-
-
 PERL					*quickfix-perl* *compiler-perl*
 
 The Perl compiler plugin doesn't actually compile, but invokes Perl's internal
@@ -1171,9 +1144,7 @@ If the error format does not contain a file name Vim cannot switch to the
 correct file.  You will have to do this by hand.
 
 
-Examples
-
-The format of the file from the Amiga Aztec compiler is:
+For example, the format of the output from the Amiga Aztec compiler is:
 
 	filename>linenumber:columnnumber:errortype:errornumber:errormessage
 
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index d320e6cd24..bb3ec6e7fe 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1147,13 +1147,10 @@ Context-sensitive completion on the command-line:
 |-n|	-n		    do not create a swap file
 |-o|	-o [num]	    open [num] windows (default: one for each file)
 |-f|	-f		    GUI: foreground process, don't fork
-			    Amiga: do not restart Vim to open a window (for
-				e.g., mail)
 |-s|	-s {scriptin}	    first read commands from the file {scriptin}
 |-w|	-w {scriptout}	    write typed chars to file {scriptout} (append)
 |-W|	-W {scriptout}	    write typed chars to file {scriptout} (overwrite)
 |-T|	-T {terminal}	    set terminal name
-|-d|	-d {device}	    Amiga: open {device} to be used as a console
 |-u|	-u {vimrc}	    read inits from {vimrc} instead of other inits
 |-U|	-U {gvimrc}	    idem, for when starting the GUI
 |-i|	-i {viminfo}	    read info from {viminfo} instead of other files
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt
index 570340cf0c..99a0837224 100644
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -56,14 +56,9 @@ Disadvantages:
 - When you use your home directory, and somebody else tries to edit the same
   file, he will not see your swap file and will not get the ATTENTION warning
   message.
-On the Amiga you can also use a recoverable ram disk, but there is no 100%
-guarantee that this works.  Putting swap files in a normal ram disk (like RAM:
-on the Amiga) or in a place that is cleared when rebooting (like /tmp on Unix)
-makes no sense, you will lose the swap file in a crash.
 
 If you want to put swap files in a fixed place, put a command resembling the
 following ones in your .vimrc:
-	:set dir=dh2:tmp	(for Amiga)
 	:set dir=~/tmp		(for Unix)
 	:set dir=c:\\tmp	(for MS-DOS and Win32)
 This is also very handy when editing files on floppy.  Of course you will have
@@ -100,8 +95,7 @@ the time with the 'updatetime' option.  The time is given in milliseconds.
 After writing to the swap file Vim syncs the file to disk.  This takes some
 time, especially on busy Unix systems.  If you don't want this you can set the
 'swapsync' option to an empty string.  The risk of losing work becomes bigger
-though.  On some non-Unix systems (MS-DOS, Amiga) the swap file won't be
-written at all.
+though.
 
 If the writing to the swap file is not wanted, it can be switched off by
 setting the 'updatecount' option to 0.  The same is done when starting Vim
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index b532a9fb02..0c0b02e591 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -7,14 +7,13 @@
 Starting Vim						*starting*
 
 1. Vim arguments		|vim-arguments|
-2. Vim on the Amiga		|starting-amiga|
-3. Running eVim			|evim-keys|
-4. Initialization		|initialization|
-5. $VIM and $VIMRUNTIME		|$VIM|
-6. Suspending			|suspend|
-7. Saving settings		|save-settings|
-8. Views and Sessions		|views-sessions|
-9. The viminfo file		|viminfo-file|
+2. Running eVim			|evim-keys|
+3. Initialization		|initialization|
+4. $VIM and $VIMRUNTIME		|$VIM|
+5. Suspending			|suspend|
+6. Saving settings		|save-settings|
+7. Views and Sessions		|views-sessions|
+8. The viminfo file		|viminfo-file|
 
 ==============================================================================
 1. Vim arguments					*vim-arguments*
@@ -413,15 +412,6 @@ argument.
 		{not in Vi} {not available when compiled without the |+diff|
 		feature}
 
--d {device}	Only on the Amiga and when not compiled with the |+diff|
-		feature.  Works like "-dev".
-							*-dev*
--dev {device}	Only on the Amiga: The {device} is opened to be used for
-		editing.
-		Normally you would use this to set the window position and
-		size: "-d con:x/y/width/height", e.g.,
-		"-d con:30/10/600/150".  But you can also use it to start
-		editing on another device, e.g., AUX:.  {not in Vi}
 							*-f*
 -f		GUI: Do not disconnect from the program that started Vim.
 		'f' stands for "foreground".  If omitted, the GUI forks a new
@@ -432,11 +422,6 @@ argument.
 		Careful: You can use "-gf" to start the GUI in the foreground,
 		but "-fg" is used to specify the foreground color.  |gui-fork|
 
-		Amiga: Do not restart Vim to open a new window.  This
-		option should be used when Vim is started by a program that
-		will wait for the edit session to finish (e.g., mail or
-		readnews).  See |amiga-window|.
-
 		MS-Windows: This option is not supported.  However, when
 		running Vim with an installed vim.bat or gvim.bat file it
 		works.
@@ -603,57 +588,7 @@ Additional arguments are available on unix like systems when compiled with
 X11 GUI support.  See |gui-resources|.
 
 ==============================================================================
-2. Vim on the Amiga					*starting-amiga*
-
-Starting Vim from the Workbench				*workbench*
--------------------------------
-
-Vim can be started from the Workbench by clicking on its icon twice.  It will
-then start with an empty buffer.
-
-Vim can be started to edit one or more files by using a "Project" icon.  The
-"Default Tool" of the icon must be the full pathname of the Vim executable.
-The name of the ".info" file must be the same as the name of the text file.
-By clicking on this icon twice, Vim will be started with the file name as
-current file name, which will be read into the buffer (if it exists).  You can
-edit multiple files by pressing the shift key while clicking on icons, and
-clicking twice on the last one.  The "Default Tool" for all these icons must
-be the same.
-
-It is not possible to give arguments to Vim, other than file names, from the
-workbench.
-
-Vim window						*amiga-window*
-----------
-
-Vim will run in the CLI window where it was started.  If Vim was started with
-the "run" or "runback" command, or if Vim was started from the workbench, it
-will open a window of its own.
-
-Technical detail:
-	To open the new window a little trick is used.  As soon as Vim
-	recognizes that it does not run in a normal CLI window, it will
-	create a script file in "t:".  This script file contains the same
-	command as the one Vim was started with, and an "endcli" command.
-	This script file is then executed with a "newcli" command (the "c:run"
-	and "c:newcli" commands are required for this to work).  The script
-	file will hang around until reboot, or until you delete it.  This
-	method is required to get the ":sh" and ":!" commands to work
-	correctly.  But when Vim was started with the -f option (foreground
-	mode), this method is not used.  The reason for this is that
-	when a program starts Vim with the -f option it will wait for Vim to
-	exit.  With the script trick, the calling program does not know when
-	Vim exits.  The -f option can be used when Vim is started by a mail
-	program which also waits for the edit session to finish.  As a
-	consequence, the ":sh" and ":!" commands are not available when the
-	-f option is used.
-
-Vim will automatically recognize the window size and react to window
-resizing.  Under Amiga DOS 1.3, it is advised to use the fastfonts program,
-"FF", to speed up display redrawing.
-
-==============================================================================
-3. Running eVim							*evim-keys*
+2. Running eVim							*evim-keys*
 
 EVim runs Vim as click-and-type editor.  This is very unlike the original Vi
 idea.  But it helps for people that don't use Vim often enough to learn the
@@ -705,7 +640,7 @@ One hint: If you want to go to Normal mode to be able to type a sequence of
 commands, use CTRL-L. |i_CTRL-L|
 
 ==============================================================================
-4. Initialization				*initialization* *startup*
+3. Initialization				*initialization* *startup*
 
 This section is about the non-GUI version of Vim.  See |gui-fork| for
 additional initialization when starting the GUI.
@@ -741,8 +676,6 @@ accordingly.  Vim proceeds in this order:
 		Unix		$HOME/.vimrc or $HOME/.vim/vimrc
 		MS-Windows	$HOME/_vimrc, $HOME/vimfiles/vimrc
 				or $VIM/_vimrc
-		Amiga		s:.vimrc, home:.vimrc, home:vimfiles:vimrc
-				or $VIM/.vimrc
 
 	The files are searched in the order specified above and only the first
 	one that is found is read.
@@ -764,9 +697,9 @@ accordingly.  Vim proceeds in this order:
      a. If vim was started as |evim| or |eview| or with the |-y| argument, the
 	script $VIMRUNTIME/evim.vim will be loaded.
 							*system-vimrc*
-     b. For Unix, MS-DOS, MS-Windows, Macintosh, and Amiga, the system vimrc
-	file is read for initializations.  The path of this file is shown with
-	the ":version" command.  Mostly it's "$VIM/vimrc".
+     b. For Unix, MS-DOS, MS-Windows, and Macintosh, the system vimrc file is
+	read for initializations.  The path of this file is shown with the
+	":version" command.  Mostly it's "$VIM/vimrc".
 	Note that this file is ALWAYS read in 'compatible' mode, since the
 	automatic resetting of 'compatible' is only done later.  Add a ":set
 	nocp" command if you like.
@@ -782,14 +715,10 @@ accordingly.  Vim proceeds in this order:
 	-  The user vimrc file(s):
 		    "$HOME/.vimrc"	   (for Unix) (*)
 		    "$HOME/.vim/vimrc"	   (for Unix) (*)
-		    "s:.vimrc"		   (for Amiga) (*)
-		    "home:.vimrc"	   (for Amiga) (*)
-		    "home:vimfiles:vimrc"  (for Amiga) (*)
-		    "$VIM/.vimrc"	   (for Amiga) (*)
 		    "$HOME/_vimrc"	   (for MS-DOS and Win32) (*)
 		    "$HOME/vimfiles/vimrc" (for MS-DOS and Win32) (*)
 		    "$VIM/_vimrc"	   (for MS-DOS and Win32) (*)
-		Note: For Unix and Amiga, when ".vimrc" does not exist,
+		Note: For Unix, when ".vimrc" does not exist,
 		"_vimrc" is also tried, in case an MS-DOS compatible file
 		system is used.  For MS-DOS and Win32 ".vimrc" is checked
 		after "_vimrc", in case long file names are used.
@@ -805,11 +734,11 @@ accordingly.  Vim proceeds in this order:
      d. If the 'exrc' option is on (which is not the default), the current
 	directory is searched for three files.  The first that exists is used,
 	the others are ignored.
-	-  The file ".vimrc" (for Unix and Amiga) (*)
+	-  The file ".vimrc" (for Unix) (*)
 		    "_vimrc" (for MS-DOS and Win32) (*)
-	-  The file "_vimrc" (for Unix and Amiga) (*)
+	-  The file "_vimrc" (for Unix) (*)
 		    ".vimrc" (for MS-DOS and Win32) (*)
-	-  The file ".exrc"  (for Unix and Amiga)
+	-  The file ".exrc"  (for Unix)
 		    "_exrc"  (for MS-DOS and Win32)
 
      (*) Using this file or environment variable will cause 'compatible' to be
@@ -877,7 +806,6 @@ Standard setup:
 Create a vimrc file to set the default settings and mappings for all your edit
 sessions.  Put it in a place so that it will be found by 3b:
 	~/.vimrc	(Unix)
-	s:.vimrc	(Amiga)
 	$VIM\_vimrc	(MS-DOS and Win32)
 Note that creating a vimrc file will cause the 'compatible' option to be off
 by default.  See |compatible-default|.
@@ -903,12 +831,6 @@ Avoiding setup problems for Vi users:
 Vi uses the variable EXINIT and the file "~/.exrc".  So if you do not want to
 interfere with Vi, then use the variable VIMINIT and the file "vimrc" instead.
 
-Amiga environment variables:
-On the Amiga, two types of environment variables exist.  The ones set with the
-DOS 1.3 (or later) setenv command are recognized.  See the AmigaDos 1.3
-manual.  The environment variables set with the old Manx Set command (before
-version 5.0) are not recognized.
-
 MS-DOS line separators:
 On MS-DOS-like systems (MS-DOS itself and Win32), Vim assumes that all
 the vimrc files have <CR> <NL> pairs as line separators.  This will give
@@ -1013,7 +935,7 @@ This still won't work for systems where gvim does not use stdout at all
 though.
 
 ==============================================================================
-5. $VIM and $VIMRUNTIME
+4. $VIM and $VIMRUNTIME
 								*$VIM*
 The environment variable "$VIM" is used to locate various user files for Vim,
 such as the user startup script ".vimrc".  This depends on the system, see
@@ -1075,7 +997,7 @@ greps in the help files) you might be able to use this: >
 	VIMRUNTIME=`vim -e -T dumb --cmd 'exe "set t_cm=\<C-M>"|echo $VIMRUNTIME|quit' | tr -d '\015' `
 
 ==============================================================================
-6. Suspending						*suspend*
+5. Suspending						*suspend*
 
 					*iconize* *iconise* *CTRL-Z* *v_CTRL-Z*
 CTRL-Z			Suspend Vim, like ":stop".
@@ -1108,7 +1030,7 @@ can't paste it in another application (since Vim is going to sleep an attempt
 to get the selection would make the program hang).
 
 ==============================================================================
-7. Saving settings					*save-settings*
+6. Saving settings					*save-settings*
 
 Mostly you will edit your vimrc files manually.  This gives you the greatest
 flexibility.  There are a few commands to generate a vimrc file automatically.
@@ -1149,7 +1071,7 @@ with ":map" and ":set" commands and write the modified file.  First read the
 default ".vimrc" in with a command like ":source ~piet/.vimrc.Cprogs", change
 the settings and then save them in the current directory with ":mkvimrc!".  If
 you want to make this file your default .vimrc, move it to your home directory
-(on Unix), s: (Amiga) or $VIM directory (MS-DOS).  You could also use
+(on Unix) or $VIM directory (MS-DOS).  You could also use
 autocommands |autocommand| and/or modelines |modeline|.
 
 						*vimrc-option-example*
@@ -1170,7 +1092,7 @@ option, which has several side effects.  See |'compatible'|.
 'compatible' option to the output file first, because of these side effects.
 
 ==============================================================================
-8. Views and Sessions					*views-sessions*
+7. Views and Sessions					*views-sessions*
 
 This is introduced in sections |21.4| and |21.5| of the user manual.
 
@@ -1317,7 +1239,7 @@ To automatically save and restore views for *.c files: >
 	au BufWinEnter *.c silent loadview
 
 ==============================================================================
-9. The viminfo file				*viminfo* *viminfo-file* *E136*
+8. The viminfo file				*viminfo* *viminfo-file* *E136*
 						*E575* *E576* *E577*
 If you exit Vim and later start it again, you would normally lose a lot of
 information.  The viminfo file can be used to remember that information, which
@@ -1384,7 +1306,7 @@ stored, but the '"' mark is.  The '"' mark is very useful for jumping to the
 cursor position when the file was last exited.  No marks are saved for files
 that start with any string given with the "r" flag in 'viminfo'.  This can be
 used to avoid saving marks for files on removable media (for MS-DOS you would
-use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:").
+use "ra:,rb:".
 The |v:oldfiles| variable is filled with the file names that the viminfo file
 has marks for.
 
@@ -1416,9 +1338,9 @@ remembered.
 VIMINFO FILE NAME					*viminfo-file-name*
 
 - The default name of the viminfo file is "$HOME/.viminfo" for Unix,
-  "s:.viminfo" for Amiga, "$HOME\_viminfo" for MS-DOS and Win32.  For the last
-  two, when $HOME is not set, "$VIM\_viminfo" is used.  When $VIM is also not
-  set, "c:\_viminfo" is used.
+  "$HOME\_viminfo" for MS-DOS and Win32.  For the last two, when $HOME is not
+  set, "$VIM\_viminfo" is used.  When $VIM is also not set, "c:\_viminfo" is
+  used.
 - The 'n' flag in the 'viminfo' option can be used to specify another viminfo
   file name |'viminfo'|.
 - The "-i" Vim argument can be used to set another file name, |-i|.  When the
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index f81a530499..ea272031d6 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -24,9 +24,9 @@ NOTE: Most of this is not used when running the |GUI|.
 ==============================================================================
 1. Startup						*startup-terminal*
 
-When Vim is started a default terminal type is assumed.  For the Amiga this is
-a standard CLI window, for MS-DOS the pc terminal, for Unix an ansi terminal.
-A few other terminal types are always available, see below |builtin-terms|.
+When Vim is started a default terminal type is assumed.  for MS-DOS this is
+the pc terminal, for Unix an ansi terminal.  A few other terminal types are
+always available, see below |builtin-terms|.
 
 You can give the terminal name with the '-T' Vim argument.  If it is not given
 Vim will try to get the name from the TERM environment variable.
@@ -84,10 +84,7 @@ defined with 't_ti' and 't_ks' will be sent to the terminal.  Normally this
 puts the terminal in a state where the termcap codes are valid and activates
 the cursor and function keys.  When Vim exits the terminal will be put back
 into the mode it was before Vim started.  The strings defined with 't_te' and
-'t_ke' will be sent to the terminal.  On the Amiga, with commands that execute
-an external command (e.g., "!!"), the terminal will be put into Normal mode
-for a moment.  This means that you can stop the output to the screen by
-hitting a printing key.  Output resumes when you hit <BS>.
+'t_ke' will be sent to the terminal.
 
 							*cs7-problem*
 Note: If the terminal settings are changed after running Vim, you might have
@@ -100,17 +97,6 @@ cursor keys send codes different from the codes defined in the termcap.  To
 avoid this you can set 't_ks' (and 't_ke') to empty strings.  This must be
 done during initialization (see |initialization|), otherwise it's too late.
 
-Some termcap entries assume that the highest bit is always reset.  For
-example: The cursor-up entry for the Amiga could be ":ku=\E[A:".  But the
-Amiga really sends "\233A".  This works fine if the highest bit is reset,
-e.g., when using an Amiga over a serial line.  If the cursor keys don't work,
-try the entry ":ku=\233A:".
-
-Some termcap entries have the entry ":ku=\E[A:".  But the Amiga really sends
-"\233A".  On output "\E[" and "\233" are often equivalent, on input they
-aren't.  You will have to change the termcap entry, or change the key code with
-the :set command to fix this.
-
 Many cursor key codes start with an <Esc>.  Vim must find out if this is a
 single hit of the <Esc> key or the start of a cursor key sequence.  It waits
 for a next character to arrive.  If it does not arrive within one second a
@@ -121,9 +107,6 @@ you want to enter a single <Esc> you must type it twice.  Resetting the
 'esckeys' option avoids this problem in Insert mode, but you lose the
 possibility to use cursor and function keys in Insert mode.
 
-On the Amiga the recognition of window resizing is activated only when the
-terminal name is "amiga" or "builtin_amiga".
-
 Some terminals have confusing codes for the cursor keys.  The televideo 925 is
 such a terminal.  It sends a CTRL-H for cursor-left.  This would make it
 impossible to distinguish a backspace and cursor-left.  To avoid this problem
@@ -516,9 +499,7 @@ closes the window.  On other systems you can probably use them.)
 [This is about the size of the whole window Vim is using, not a window that is
 created with the ":split" command.]
 
-If you are running Vim on an Amiga and the terminal name is "amiga" or
-"builtin_amiga", the amiga-specific window resizing will be enabled.  On Unix
-systems three methods are tried to get the window size:
+On Unix systems, three methods are tried to get the window size:
 
 - an ioctl call (TIOCGSIZE or TIOCGWINSZ, depends on your system)
 - the environment variables "LINES" and "COLUMNS"
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 7f5e8ff390..c6a8398737 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1377,11 +1377,6 @@ character typed. (Tyler Spivey, 2008 Sep 3)  Only redraw cmdline for
 Cheng Fang made javacomplete. (2007 Aug 11)
 Asked about latest version: 0.77.1 is on www.vim.org.
 
-More AmigaOS4 patches. (Peter Bengtsson, Nov 9)
-
-Amiga patches with vbcc. (Adrien Destugues, 2010 Aug 30)
-http://pulkomandy.ath.cx/drop/vim73_vbcc_amiga.diff
-
 Insert mode completion: When editing the text and pressing CTRL-N again goes
 back to originally completed text, edited text is gone. (Peng Yu, 2008 Jul 24)
 Suggestion by Ben Schmidt, 2008 Aug 6.
@@ -2238,11 +2233,9 @@ GUI:
     Need better separation of Vim core and GUI code.
 8   When fontset support is enabled, setting 'guifont' to a single font
     doesn't work.
-8   Menu priority for sub-menus for: Amiga.
 8   When translating menus ignore the part after the Tab, the shortcut.  So
     that the same menu item with a different shortcut (e.g., for the Mac) are
     still translated.
-8   Add menu separators for Amiga.
 8   Add way to specify the file filter for the browse dialog.  At least for
     browse().
 8   Add dialog for search/replace to other GUIs?  Tk has something for this,
@@ -2351,15 +2344,6 @@ Win32 console:
     exiting.
 
 
-Amiga:
-8   In mch_inchar() should use convert_input_safe() to handle incomplete byte
-    sequences.
-9   In mch_expandpath() a "*" is to be expanded, but "\*" isn't.  Remove
-    backslashes in result.
-8   Executing a shell, only one option for 'shell' is separated.  Should do
-    all options, using white space separation.
-
-
 Macintosh:
 -   GUI: gui_mch_browsedir() is missing.
 7   Loading the Perl library only works on OS/X 10.2 or 10.3, never on both.
@@ -2676,9 +2660,6 @@ Problems that will (probably) not be solved:
 -   In zsh, "gvim&" changes the terminal settings.  This is a zsh problem.
     (Jennings)
 -   Problem with HPterm under X: old contents of window is lost (Cosentino).
--   Amiga: When using quickfix with the Manx compiler we only get the first 25
-    errors.  How do we get the rest?
--   Amiga: The ":cq" command does not always abort the Manx compiler.  Why?
 -   Linux: A file with protection r--rw-rw- is seen readonly for others.  The
     access() function in GNU libc is probably wrong.
 -   MSDOS: When using smartdrive with write-back buffering, writing to a
@@ -2856,7 +2837,6 @@ User Friendlier:
     disabling it.  Be careful that tear-offs don't disappear (keep one empty
     item?).
     Alternative: use BufEnter and BufLeave autocommands.
-8   make a vimtutor script for Amiga and other systems.
 7   Add the arguments for configure to the ":version" output?
 7   When Vim detects a file is being edited elsewhere and it's a gvim session
     of the same user it should offer a "Raise" button, so that the other gvim
@@ -3730,7 +3710,6 @@ Win32 GUI:
 
 
 GUI:
-8   Make inputdialog() work for Amiga.
 -   <C--> cannot be mapped.  Should be possible to recognize this as a
     normal "-" with the Ctrl modifier.
 7   Implement ":popup" for other systems than Windows.
@@ -4801,8 +4780,7 @@ Digraphs:
 
 
 Writing files:
--   In vim_rename(), should lock "from" file when deleting "to" file for
-    systems other than Amiga.
+-   In vim_rename(), should lock "from" file when deleting "to" file.
 8   When appending to a file, Vim should also make a backup and a 'patchmode'
     file.
 8   'backupskip' doesn't write a backup file at all, a bit dangerous for some
@@ -4857,7 +4835,6 @@ Mouse support:
 8   Add 'mouse' flag, which sets a behavior like Visual mode, but automatic
     yanking at the button-up event.  Or like Select mode, but typing gets you
     out of Select mode, instead of replacing the text. (Bhaskar)
--   Implement mouse support for the Amiga console.
 -   Using right mouse button to extend a blockwise selection should attach to
     the nearest corner of the rectangle (four possible corners).
 -   Precede mouse click by a number to simulate double clicks?!?
@@ -5199,8 +5176,6 @@ Various improvements:
 -   Add "-d null" for editing from a script file without displaying.
 -   In Insert mode: Remember the characters that were removed with backspace
     and re-insert them one at a time with <key1>, all together with <key2>.
--   Amiga: Add possibility to set a keymap.  The code in amiga.c does not work
-    yet.
 -   Implement 'redraw' option.
 -   Add special code to 'sections' option to define something else but '{' or
     '}' as the start of a section (e.g. one shiftwidth to the right).
@@ -5219,15 +5194,12 @@ Various improvements:
     off".
 -   Check handling of CTRL-V and '\' for ":" commands that do not have TRLBAR.
 -   When a file cannot be opened but does exist, give error message.
--   Amiga: When 'r' protection bit is not set, file can still be opened but
-    gives read errors.  Check protection before opening.
 -   When writing check for file exists but no permission, "Permission denied".
 -   If file does not exist, check if directory exists.
 -   MSDOS: although t_cv and t_ci are not set, do invert char under cursor.
 -   Settings edit mode: make file with ":set opt=xx", edit it, parse it as ex
     commands.
 -   ":set -w all": list one option per line.
--   Amiga: test for 'w' flag when reading a file.
 -   :table command (Webb)
 -   Add new operator: clear, make area white (replace with spaces): "g ".
 -   Add command to ":read" a file at a certain column (blockwise read?).
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index 0629687797..df76542c6e 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -73,8 +73,6 @@ Unix: >
 	:!cp -i $VIMRUNTIME/vimrc_example.vim ~/.vimrc
 MS-DOS, MS-Windows: >
 	:!copy $VIMRUNTIME/vimrc_example.vim $VIM/_vimrc
-Amiga: >
-	:!copy $VIMRUNTIME/vimrc_example.vim $VIM/.vimrc
 
 If the file already exists you probably want to keep it.
 
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index c448dd56f1..9eee058a99 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -309,7 +309,6 @@ Then copy the file to your plugin directory:
 
 	system		plugin directory ~
 	Unix		~/.vim/plugin/
-	Amiga		s:vimfiles/plugin
 	Macintosh	$VIM:vimfiles:plugin
 	Mac OS X	~/.vim/plugin/
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 6f639e0fe9..be0bfb1f23 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -300,7 +300,6 @@ g8			Print the hex values of the bytes used in the
 
 							*+feature-list*
    *+acl*		|ACL| support included
-   *+ARP*		Amiga only: ARP support included
 B  *+arabic*		|Arabic| language support
 N  *+autocmd*		|:autocmd|, automatic commands
 m  *+balloon_eval*	|balloon-eval| support. Included when compiling with
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 0513b473dd..66cc9c0412 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -71,10 +71,8 @@ Vim has only a few limits for the files that can be edited {Vi: can not handle
 <Nul> characters and characters above 128, has limited line length, many other
 limits}.
 							*E340*
-Maximum line length	   On machines with 16-bit ints (Amiga and MS-DOS real
-			   mode): 32767, otherwise 2147483647 characters.
-			   Longer lines are split.
-Maximum number of lines	   2147483647 lines.
+Maximum line length	   2147483647 characters
+Maximum number of lines	   2147483647 lines
 Maximum file size	   2147483647 bytes (2 Gbyte) when a long integer is
 			   32 bits.  Much more for 64 bit longs.  Also limited
 			   by available disk space for the |swap-file|.
@@ -102,9 +100,8 @@ Memory usage limits
 
 The option 'maxmem' ('mm') is used to set the maximum memory used for one
 buffer (in kilobytes).  'maxmemtot' is used to set the maximum memory used for
-all buffers (in kilobytes).  The defaults depend on the system used.  For the
-Amiga and MS-DOS, 'maxmemtot' is set depending on the amount of memory
-available.
+all buffers (in kilobytes).  The defaults depend on the system used.  For
+MS-DOS, 'maxmemtot' is set depending on the amount of memory available.
 These are not hard limits, but tell Vim when to move text into a swap file.
 If you don't like Vim to swap to a file, set 'maxmem' and 'maxmemtot' to a
 very large value.  The swap file will then only be used for recovery.  If you
@@ -132,7 +129,6 @@ Support for different systems.
 	Vim can be used on:
 	- All Unix systems (it works on all systems it was tested on, although
 	  the GUI and Perl interface may not work everywhere).
-	- Amiga (500, 1000, 1200, 2000, 3000, 4000, ...).
 	- MS-DOS in real-mode (no additional drivers required).
 	- In protected mode on Windows 3.1 and MS-DOS (DPMI driver required).
 	- Windows 95 and Windows NT, with support for long file names.
@@ -158,7 +154,7 @@ Graphical User Interface (GUI).				|gui|
 	define your own menus.  Better support for CTRL/SHIFT/ALT keys in
 	combination with special keys and mouse.  Supported for various
 	platforms, such as X11 (with Motif and Athena interfaces), GTK, Win32
-	(Windows 95 and later), Amiga and Macintosh.
+	(Windows 95 and later), and Macintosh.
 
 Multiple windows and buffers.				|windows.txt|
 	Vim can split the screen into several windows, each editing a
@@ -717,10 +713,6 @@ When the 'fileformats' option is not empty, Vim tries to detect the type of
 On systems that have no job control (older Unix systems and non-Unix systems)
 the CTRL-Z, ":stop" or ":suspend" command starts a new shell.
 
-If Vim is started on the Amiga without an interactive window for output, a
-window is opened (and :sh still works).  You can give a device to use for
-editing with the |-d| argument, e.g. "-d con:20/20/600/150".
-
 The 'columns' and 'lines' options are used to set or get the width and height
 of the display.
 
@@ -733,8 +725,8 @@ If the 'insertmode' option is set (e.g. in .exrc), Vim starts in insert mode.
 And it comes back there, when pressing <Esc>.
 
 Undo information is kept in memory.  Available memory limits the number and
-size of change that can be undone.  This may be a problem with MS-DOS, is
-hardly a problem on the Amiga and almost never with Unix and Win32.
+size of change that can be undone.  This may be a problem with MS-DOS, but is
+almost never one with Unix and Win32.
 
 If the 'backup' or 'writebackup' option is set: Before a file is overwritten,
 a backup file (.bak) is made.  If the "backup" option is set it is left
@@ -759,8 +751,6 @@ changing files.
 The "No lines in buffer" message is a normal message instead of an error
 message, since that may cause a mapping to be aborted.
 
-The AUX: device of the Amiga is supported.
-
 ==============================================================================
 6. Command-line arguments				*cmdline-arguments*
 
@@ -836,12 +826,8 @@ Only Vim is able to accept options in between and after the file names.
 		loading the edit buffer.
 		Vim: allow up to 10 "-c" arguments
 
--d {device}	Vim: Use {device} for I/O (Amiga only). {only when compiled
-		without the |+diff| feature}
 -d		Vim: start with 'diff' set. |vimdiff|
 
--dev {device}	Vim: Use {device} for I/O (Amiga only).
-
 -D		Vim: debug mode.
 
 -e		Elvis, Nvi, Vim: Start in Ex mode, as if the executable is
@@ -849,7 +835,7 @@ Only Vim is able to accept options in between and after the file names.
 
 -E		Vim: Start in improved Ex mode |gQ|, like "exim".
 
--f		Vim: Run GUI in foreground (Amiga: don't open new window).
+-f		Vim: Run GUI in foreground.
 -f {session}	Elvis: Use {session} as the session file.
 
 -F		Vim: Start in Farsi mode (when compiled with Farsi).
diff --git a/runtime/gvimrc_example.vim b/runtime/gvimrc_example.vim
index ad0fa1b982..ab9803413b 100644
--- a/runtime/gvimrc_example.vim
+++ b/runtime/gvimrc_example.vim
@@ -6,7 +6,6 @@
 "
 " To use it, copy it to
 "  for Unix:  ~/.gvimrc
-"  for Amiga:  s:.gvimrc
 "  for MS-DOS and Win32:  $VIM\_gvimrc
 
 " Make external commands work through a pipe instead of a pseudo-tty
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 682e6afac8..5cbc0faabd 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -194,8 +194,6 @@ fun! s:EditVimrc()
     else
       let fname = $VIM . "/_vimrc"
     endif
-  elseif has("amiga")
-    let fname = "s:.vimrc"
   else
     let fname = $HOME . "/.vimrc"
   endif
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 251e4c8f08..93206b8e6e 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -223,11 +223,6 @@ else
 	\ || s:line5 =~ '^\s*dnl\>'
     set ft=m4
 
-    " AmigaDos scripts
-  elseif $TERM == "amiga"
-	\ && (s:line1 =~ "^;" || s:line1 =~ '^\.[bB][rR][aA]')
-    set ft=amiga
-
     " SiCAD scripts (must have procn or procd as the first line to trigger this)
   elseif s:line1 =~? '^ *proc[nd] *$'
     set ft=sicad
diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
index 6b234459e2..11656f2d5d 100644
--- a/runtime/vimrc_example.vim
+++ b/runtime/vimrc_example.vim
@@ -5,7 +5,6 @@
 "
 " To use it, copy it to
 "     for Unix:  ~/.vimrc
-"     for Amiga:  s:.vimrc
 "     for MS-DOS and Win32:  $VIM\_vimrc
 
 " When started as "evim", evim.vim will already have done these settings.
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(&params);
 
@@ -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/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