Merge pull request #2532 from Pyrohh/doc-cleanup-3

[RDY] Doc cleanup (3) + terminal remnants

Reviewed-by: Justin M. Keyes <justinkz@gmail.com>

27 files changed, 30 insertions, 306 deletions

diff --git a/clint-ignored-files.txt b/clint-ignored-files.txt
index e0e6b9f3d2..f906794078 100644
--- a/clint-ignored-files.txt
+++ b/clint-ignored-files.txt
@@ -116,9 +116,6 @@ src/nvim/syntax.h
 src/nvim/syntax_defs.h
 src/nvim/tag.c
 src/nvim/tag.h
-src/nvim/term.c
-src/nvim/term.h
-src/nvim/term_defs.h
 src/nvim/ui.c
 src/nvim/ui.h
 src/nvim/undo.c
diff --git a/config/config.h.in b/config/config.h.in
index 0419451e26..d7f3913e27 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -65,7 +65,6 @@
 
 #define FEAT_BROWSE
 #define FEAT_CSCOPE
-#define FEAT_MOUSE
 
 #ifndef UNIT_TESTING
 #cmakedefine HAVE_JEMALLOC
diff --git a/man/de/nvim-de.1 b/man/de/nvim-de.1
index 50dd0ce7e6..2d56ff0bc0 100644
--- a/man/de/nvim-de.1
+++ b/man/de/nvim-de.1
@@ -236,11 +236,6 @@ Zeichen in ihr tippen. Dasselbe kann mit dem Befehl »:source!
 {Eingabeskript}« erreicht werden. Wird das Ende der Datei vor dem Beenden
 des Editors erreicht, werden weitere Zeichen von der Tastatur gelesen.
 .TP 
-\-T {Terminal}
-Setzt den Namen des benutzten Terminals. Nur erforderlich, wenn die
-Automatik nicht funktioniert. Sollte ein \fBVim\fP bekanntes Terminal sein:
-(builtin) oder in einer termcap\- oder terminfo\-Datei definiert.
-.TP 
 \-u {VimRC}
 Verwendet zur Initialisierung die Befehle in der Datei {VimRC}. Alle anderen
 Initialisierungen werden übersprungen. Benutzen Sie dies, um eine besondere
diff --git a/man/fr/nvim-fr.1 b/man/fr/nvim-fr.1
index a794a814dd..c2e6f25756 100644
--- a/man/fr/nvim-fr.1
+++ b/man/fr/nvim-fr.1
@@ -301,15 +301,6 @@ La commande ":source! {scriptEntrée}" donne le même résultat.
 Si la fin du fichier est atteinte avant que l'éditeur quitte, les caractères
 suivants sont lus depuis le clavier.
 .TP
-\-T {terminal}
-Indique à
-.B Vim
-le nom du terminal utilisé.
-Cela n'est requis que lorsque la détection automatique échoue.
-Le {terminal} devrait être connu de
-.B Vim
-(intégré) ou défini dans le fichier termcap ou terminfo.
-.TP
 \-u {vimrc}
 Utilise les commandes du fichier {vimrc} pour les initialisations.
 Toutes les autres initialisations sont omises.
diff --git a/man/it/nvim-it.1 b/man/it/nvim-it.1
index 1bee867e2a..e529ee511f 100644
--- a/man/it/nvim-it.1
+++ b/man/it/nvim-it.1
@@ -283,15 +283,6 @@ Lo stesso si può ottenere col comando ":source! {scriptin}".
 Se la fine del file di input viene raggiunta prima che Vim termini,
 l'ulteriore input viene preso dalla tastiera.
 .TP
-\-T {terminale}
-Dice a
-.B Vim
-quale tipo di terminale state usando.
-Utile solo se il terminale non viene riconosciuto correttamente da Vim.
-Dovrebbe essere un terminale noto a
-.B Vim
-(internamente) o definito nel file termcap o terminfo.
-.TP
 \-u {vimrc}
 Usa i comandi nel file {vimrc} per inizializzazioni.
 Tutte le altre inizializzazioni non sono eseguite.
diff --git a/man/ja/nvim-ja.1 b/man/ja/nvim-ja.1
index ad5f24d53a..bd94da5cc5 100644
--- a/man/ja/nvim-ja.1
+++ b/man/ja/nvim-ja.1
@@ -241,12 +241,6 @@ N を省略した場合は、引数のファイルを個別のタブページで
 エディタが終了する前にファイルの終わりまで読み込んだ場合、
 それ以降はキーボードから入力を読み込みます。
 .TP
-\-T {terminal}
-端末の名前を指定します。
-端末が自動的に認識されない場合に使ってください。
-Vim が組み込みでサポートしている名前か、
-termcap または terminfo ファイルで定義されている名前を指定してください。
-.TP
 \-u {vimrc}
 {vimrc} ファイルを使って初期化します。
 他の初期化処理はスキップされます。
diff --git a/man/pl/nvim-pl.1 b/man/pl/nvim-pl.1
index 0f4128d8bd..46a728b301 100644
--- a/man/pl/nvim-pl.1
+++ b/man/pl/nvim-pl.1
@@ -283,15 +283,6 @@ To samo można osiągnąć poprzez polecenie ":source! {skrypt}".
 Jeśli osiągnięto koniec pliku zanim edytor zakończył działanie, dalsze
 znaki odczytywane są z klawiatury.
 .TP
-\-T {terminal}
-Przekazuje
-.B Vimowi
-nazwę terminalu jakiego używasz.
-Wymagane tylko wtedy jeśli nie działa automatycznie.
-Powinien być to terminal znany
-.B Vimowi
-(builtin) lub zdefiniowany w plikach termcap lub terminfo.
-.TP
 \-u {vimrc}
 Użyj poleceń z pliku {vimrc} w czasie uruchamiania.
 Wszystkie inne możliwe pliki uruchamiania zostaną pominięte.
diff --git a/man/ru/nvim-ru.1 b/man/ru/nvim-ru.1
index 1d4221b3ab..3c9bf1a1a4 100644
--- a/man/ru/nvim-ru.1
+++ b/man/ru/nvim-ru.1
@@ -246,15 +246,6 @@ vim \- Vi IMproved (Улучшенный Vi), текстовый редакто�
 Если конец файла считывается до завершения работы редактора, то в дальнейшем 
 ввод осуществляется с клавиатуры.
 .TP
-\-T {terminal}
-Сообщает
-.B Vim
-тип используемого терминала. Необходимо только в тех ситуациях, когда 
-автоматическое определение терминала не работает. Имя терминала должно быть 
-известно
-.B Vim
-(встроено в него) или определено в файлах termcap или terminfo.
-.TP
 \-u {vimrc}
 Использовать команды из файла сценария {vimrc} для настройки.
 Все остальные файлы настроек пропускаются.
diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt
index 7806419d4e..f1eb5639bd 100644
--- a/runtime/doc/debugger.txt
+++ b/runtime/doc/debugger.txt
@@ -7,8 +7,6 @@
 Debugger Support Features				*debugger-support*
 
 1. Debugger Features		|debugger-features|
-2. Vim Compile Options		|debugger-compilation|
-3. Integrated Debuggers		|debugger-integration|
 
 ==============================================================================
 1. Debugger Features					*debugger-features*
@@ -106,29 +104,4 @@ Another way to use the balloon is with the 'balloonexpr' option.  This is
 completely user definable.
 
 ==============================================================================
-2. Vim Compile Options					*debugger-compilation*
-
-The debugger features were added explicitly for use with Sun's Visual
-WorkShop Integrated Programming Environment (ipe).  However, they were done
-in as generic a manner as possible so that integration with other debuggers
-could also use some or all of the tools used with Sun's ipe.
-
-The following compile time preprocessor variables control the features:
-
-    Alternate Command Input			ALT_X_INPUT
-    Debug Glyphs				FEAT_SIGNS
-    Debug Highlights				FEAT_SIGNS
-    Message Footer				FEAT_FOOTER
-    Balloon Evaluation				FEAT_BEVAL
-
-The first integration with a full IPE/IDE was with Sun Visual WorkShop.  To
-compile a gvim which interfaces with VWS set the following flag, which sets
-all the above flags:
-
-    Sun Visual WorkShop				FEAT_SUN_WORKSHOP
-
-==============================================================================
-3. Integrated Debuggers					*debugger-integration*
-
-
  vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 5eb8f62d8b..4e825e123c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6771,13 +6771,6 @@ menu			Compiled with support for |:menu|.
 mksession		Compiled with support for |:mksession|.
 modify_fname		Compiled with file name modifiers. |filename-modifiers|
 mouse			Compiled with support mouse.
-mouse_dec		Compiled with support for Dec terminal mouse.
-mouse_gpm		Compiled with support for gpm (Linux console mouse)
-mouse_netterm		Compiled with support for netterm mouse.
-mouse_sysmouse		Compiled with support for sysmouse (*BSD console mouse)
-mouse_sgr		Compiled with support for sgr mouse.
-mouse_urxvt		Compiled with support for urxvt mouse.
-mouse_xterm		Compiled with support for xterm mouse.
 mouseshape		Compiled with support for 'mouseshape'.
 multi_byte		Compiled with support for 'encoding'
 multi_byte_encoding	'encoding' is set to a multi-byte encoding.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 439c8778cc..5db27886bf 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4552,10 +4552,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'mouse'* *E538*
 'mouse'			string	(default "", "a" for GUI, MS-DOS and Win32)
 			global
-	Enable the use of the mouse.  Only works for certain terminals
-	(xterm, Win32 |win32-mouse|, *BSD console with sysmouse and Linux
-	console with gpm).  For using the mouse in the GUI, see |gui-mouse|.
-	The mouse can be enabled for different modes:
+
+	Enable the use of the mouse.  Only works for certain terminals.
+	For using the mouse in the GUI, see |gui-mouse|.  The mouse can be
+	enabled for different modes:
 		n	Normal mode
 		v	Visual mode
 		i	Insert mode
@@ -6771,80 +6771,16 @@ A jump table for the options with a short description can be found at |Q_op|.
 	by user preferences or the current theme is used.
 
 			     *'ttybuiltin'* *'tbi'* *'nottybuiltin'* *'notbi'*
-'ttybuiltin' 'tbi'	Removed. {Nvim}
+'ttybuiltin' 'tbi'	Removed. |vim-differences| {Nvim}
 
 				     *'ttyfast'* *'tf'* *'nottyfast'* *'notf'*
 'ttyfast' 'tf'		Removed. |vim-differences| {Nvim}
 
 						*'ttymouse'* *'ttym'*
-'ttymouse' 'ttym'	string	(default depends on 'term')
-			global
-			{only in Unix, doesn't work in the GUI; not
-			available when compiled without |+mouse|}
-	Name of the terminal type for which mouse codes are to be recognized.
-	Currently these strings are valid:
-							*xterm-mouse*
-	   xterm	xterm-like mouse handling.  The mouse generates
-			"<Esc>[Mscr", where "scr" is three bytes:
-				"s"  = button state
-				"c"  = column plus 33
-				"r"  = row plus 33
-			This only works up to 223 columns!  See "dec",
-			"urxvt", and "sgr" for solutions.
-	   xterm2	Works like "xterm", but with the xterm reporting the
-			mouse position while the mouse is dragged.  This works
-			much faster and more precise.  Your xterm must at
-			least at patchlevel 88 / XFree 3.3.3 for this to
-			work.  See below for how Vim detects this
-			automatically.
-							*netterm-mouse*
-	   netterm	NetTerm mouse handling.  The mouse generates
-			"<Esc>}r,c<CR>", where "r,c" are two decimal numbers
-			for the row and column.
-							*dec-mouse*
-	   dec		DEC terminal mouse handling.  The mouse generates a
-			rather complex sequence, starting with "<Esc>[".
-			This is also available for an Xterm, if it was
-			configured with "--enable-dec-locator".
-							*urxvt-mouse*
-	   urxvt	Mouse handling for the urxvt (rxvt-unicode) terminal.
-			The mouse works only if the terminal supports this
-			encoding style, but it does not have 223 columns limit
-			unlike "xterm" or "xterm2".
-							*sgr-mouse*
-	   sgr		Mouse handling for the terminal that emits SGR-styled
-			mouse reporting.  The mouse works even in columns
-			beyond 223.  This option is backward compatible with
-			"xterm2" because it can also decode "xterm2" style
-			mouse codes.
-
-	The mouse handling must be enabled at compile time |+mouse_xterm|
-	|+mouse_dec| |+mouse_netterm| |+mouse_urxvt| |+mouse_sgr|.
-	Only "xterm"(2) is really recognized.  NetTerm mouse codes are always
-	recognized, if enabled at compile time.  DEC terminal mouse codes
-	are recognized if enabled at compile time, and 'ttymouse' is not
-	"xterm", "xterm2", "urxvt" or "sgr" (because dec mouse codes conflict
-	with them).
-	This option is automatically set to "xterm", when the 'term' option is
-	set to a name that starts with "xterm", "mlterm", or "screen", and
-	'ttymouse' is not set already.
-	Additionally, if vim is compiled with the |+termresponse| feature and
-	|t_RV| is set to the escape sequence to request the xterm version
-	number, more intelligent detection process runs.
-	The "xterm2" value will be set if the xterm version is reported to be
-	from 95 to 276.  The "sgr" value will be set if the xterm version is
-	277 or highter.
-	If you do not want 'ttymouse' to be set to "xterm2" or "sgr"
-	automatically, set t_RV to an empty string: >
-		:set t_RV=
-<
+'ttymouse' 'ttym'	Removed. |vim-differences| {Nvim}
+
 						*'ttyscroll'* *'tsl'*
-'ttyscroll' 'tsl'	number	(default 999)
-			global
-	Maximum number of lines to scroll the screen.  If there are more lines
-	to scroll the window is redrawn.  For terminals where scrolling is
-	very slow and redrawing is not slow this can be set to a small number,
-	e.g., 3, to speed up displaying.
+'ttyscroll' 'tsl'	Removed. |vim-differences| {Nvim}
 
 						*'ttytype'* *'tty'*
 'ttytype' 'tty'		string	(default from $TERM)
@@ -7163,12 +7099,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	has been changed.
 
 		     *'weirdinvert'* *'wiv'* *'noweirdinvert'* *'nowiv'*
-'weirdinvert' 'wiv'	boolean	(default off)
-			global
-	This option has the same effect as the 't_xs' terminal option.
-	It is provided for backwards compatibility with version 4.x.
-	Setting 'weirdinvert' has the effect of making 't_xs' non-empty, and
-	vice versa.  Has no effect when the GUI is running.
+'weirdinvert' 'wiv'	Removed. |vim-differences| {Nvim}
 
 						*'whichwrap'* *'ww'*
 'whichwrap' 'ww'	string	(Vim default: "b,s", Vi default: "")
diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt
index 2955a532fe..604fa5827a 100644
--- a/runtime/doc/os_unix.txt
+++ b/runtime/doc/os_unix.txt
@@ -35,8 +35,7 @@ When using Vim in an xterm the mouse clicks can be used by Vim by setting
 'mouse' to "a".  If there is access to an X-server gui style copy/paste will
 be used and visual feedback will be provided while dragging with the mouse.
 If you then still want the xterm copy/paste with the mouse, press the shift
-key when using the mouse.  See |mouse-using|.  Visual feedback while dragging
-can also be achieved via the 'ttymouse' option if your xterm is new enough.
+key when using the mouse.  See |mouse-using|.
 
 							*terminal-colors*
 To use colors in Vim you can use the following example (if your terminal
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 5daeb15c00..92492f72e1 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -902,8 +902,6 @@ Short explanation of each option:		*option-list*
 'toolbariconsize' 'tbis'    size of the toolbar icons (for GTK 2 only)
 'ttimeout'		    time out on mappings
 'ttimeoutlen'	  'ttm'     time out time for key codes in milliseconds
-'ttymouse'	  'ttym'    type of mouse codes generated
-'ttyscroll'	  'tsl'     maximum number of lines for a scroll
 'ttytype'	  'tty'     alias for 'term'
 'undodir'	  'udir'    where to store undo files
 'undofile'	  'udf'	    save undo information in a file
@@ -919,7 +917,6 @@ Short explanation of each option:		*option-list*
 'virtualedit'	  've'	    when to use virtual editing
 'visualbell'	  'vb'	    use visual bell instead of beeping
 'warn'			    warn for shell command when buffer was changed
-'weirdinvert'	  'wiv'	    for terminals that have weird inversion method
 'whichwrap'	  'ww'	    allow specified keys to cross line boundaries
 'wildchar'	  'wc'	    command-line character for wildcard expansion
 'wildcharm'	  'wcm'     like 'wildchar' but also works when mapped
@@ -1137,7 +1134,6 @@ Context-sensitive completion on the command-line:
 |-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
 |-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/starting.txt b/runtime/doc/starting.txt
index 017fba1824..3475a63307 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -309,13 +309,6 @@ argument.
 		'tabpagemax' pages (default 10).  If there are more tab pages
 		than arguments, the last few tab pages will be editing an
 		empty file.  Also see |tabpage|.
-
-							*-T*
--T {terminal}	Set the terminal type to "terminal".  This influences the
-		codes that Vim will send to your terminal.  This is normally
-		not needed, because Vim will be able to find out what type
-		of terminal you are using.  (See |terminal-info|.)
-
 							*-d*
 -d		Start in |diff-mode|.
 
@@ -772,7 +765,7 @@ To change it later, use a ":let" command like this: >
 In case you need the value of $VIMRUNTIME in a shell (e.g., for a script that
 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' `
+	VIMRUNTIME="$(nvim -e --cmd 'echo $VIMRUNTIME|quit' 2>&1)"
 
 ==============================================================================
 5. Suspending						*suspend*
@@ -832,10 +825,10 @@ vimrc file.
 These commands will write ":map" and ":set" commands to a file, in such a way
 that when these commands are executed, the current key mappings and options
 will be set to the same values.  The options 'columns', 'endofline',
-'fileformat', 'lines', 'modified', 'scroll', 'term', and 'ttymouse' are not
-included, because these are terminal or file dependent.  Note that the options
-'binary', 'paste' and 'readonly' are included, this might not always be what
-you want.
+'fileformat', 'lines', 'modified', 'scroll', and 'term' are not included,
+because these are terminal or file dependent.
+Note that the options 'binary', 'paste' and 'readonly' are included, this
+might not always be what you want.
 
 When special keys are used in mappings, The 'cpoptions' option will be
 temporarily set to its Vim default, to avoid the mappings to be
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index e0e7f37948..da3e1ac11e 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -27,9 +27,6 @@ NOTE: Most of this is not used when running the |GUI|.
 When Vim is started a default terminal type is assumed.  for MS-DOS this is
 the pc terminal, for Unix an ansi terminal.
 
-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.
-
 				*termcap* *terminfo* *E557* *E558* *E559*
 On Unix the terminfo database or termcap file is used.  This is referred to as
 "termcap" in all the documentation.  At compile time, when running configure,
@@ -243,7 +240,7 @@ Added by Vim (there are no standard codes for these):
 	t_EI	end insert mode (block cursor shape)		*t_EI* *'t_EI'*
 		|termcap-cursor-shape|
 	t_RV	request terminal version string (for xterm)	*t_RV* *'t_RV'*
-		|xterm-8bit| |v:termresponse| |'ttymouse'| |xterm-codes|
+		|xterm-8bit| |v:termresponse| |xterm-codes|
 	t_u7	request cursor position (for xterm)		*t_u7* *'t_u7'*
 		see |'ambiwidth'|
 
@@ -504,10 +501,6 @@ If the characters from the terminal are arriving with more than 1 second
 between them you might want to set the 'timeout' and/or 'ttimeout' option.
 See the "Options" chapter |options|.
 
-If your terminal scrolls very slowly, but redrawing is not slow, set the
-'ttyscroll' option to a small number, e.g., 3.  This will make Vim redraw the
-screen instead of scrolling, when there are more than 3 lines to be scrolled.
-
 If you are using a color terminal that is slow, use this command: >
 	hi NonText cterm=NONE ctermfg=NONE
 This avoids that spaces are sent when they have different attributes.  On most
@@ -533,11 +526,6 @@ Don't forget to enable the mouse with this command: >
 	:set mouse=a
 Otherwise Vim won't recognize the mouse in all modes (See 'mouse').
 
-Currently the mouse is supported for Unix in an xterm window, in a *BSD
-console with |sysmouse|, in a Linux console (with GPM |gpm-mouse|), for
-MS-DOS and in a Windows console.
-Mouse clicks can be used to position the cursor, select an area and paste.
-
 These characters in the 'mouse' option tell in which situations the mouse will
 be used by Vim:
 		n	Normal mode
@@ -600,7 +588,7 @@ When the X-server clipboard is available, the command server described in
 							*xterm-copy-paste*
 NOTE: In some (older) xterms, it's not possible to move the cursor past column
 95 or 223.  This is an xterm problem, not Vim's.  Get a newer xterm
-|color-xterm|.  Also see |'ttymouse'|.
+|color-xterm|.
 
 Copy/paste in xterm with (current mode NOT included in 'mouse'):
 1. Press left mouse button on first letter of text, move mouse pointer to last
@@ -731,20 +719,10 @@ and then drag) will result in whole words to be selected.  This continues
 until the button is released, at which point the selection is per character
 again.
 
-							*gpm-mouse*
-The GPM mouse is only supported when the |+mouse_gpm| feature was enabled at
-compile time.  The GPM mouse driver (Linux console) does not support quadruple
-clicks.
-
 In Insert mode, when a selection is started, Vim goes into Normal mode
 temporarily.  When Visual or Select mode ends, it returns to Insert mode.
 This is like using CTRL-O in Insert mode.  Select mode is used when the
 'selectmode' option contains "mouse".
-							*sysmouse*
-The sysmouse is only supported when the |+mouse_sysmouse| feature was enabled
-at compile time.  The sysmouse driver (*BSD console) does not support keyboard
-modifiers.
-
 							*drag-status-line*
 When working with several windows, the size of the windows can be changed by
 dragging the status line with the mouse.  Point the mouse at a status line,
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 5078f5c7ce..c0e4bf6865 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -540,11 +540,6 @@ is confusing.  Should say "the argument list is empty".
 xterm supports escape sequences to mark a paste operation.  Need to be
 enabled. (Bruno Sutic, 2014 Jul 11)  How to know the terminal supports this?
 
-URXVT:
-- will get stuck if byte sequence does not contain the expected semicolon.
-- Use urxvt mouse support also in xterm.  Explanations:
-  http://www.midnight-commander.org/ticket/2662
-
 Patch to have the fold and sign column and at the last line of the buffer.
 (Marco Hinz, 2014 Sep 25)
 Alternate suggestion: let all columns continue, also the number column.
@@ -3146,8 +3141,6 @@ Performance:
     default, instead of using the block size of the device, because the swap
     file is created only after setting the block size in mf_open().  How can
     this be improved?
-8   Set default for 'ttyscroll' to half a screen height?  Should speed up
-    MS-DOS version. (Negri)
 7   C syntax highlighting gets a lot slower after ":set foldmethod=syntax".
     (Charles Campbell)  Inserting a "{" is very slow. (dman)
 7   HTML syntax highlighting is slow for long lines.  Try displaying
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 6419ecb628..ef5844b2d2 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -231,7 +231,7 @@ g8			Print the hex values of the bytes used in the
 			and |nvim-terminal-emulator| for more information.
 
 							*:!cmd* *:!* *E34*
-:!{cmd}			Execute {cmd} with the shell. See also 'shell'.
+:!{cmd}			Execute {cmd} with 'shell'. See also |:terminal|.
 
 			Any '!' in {cmd} is replaced with the previous
 			external command (see also 'cpoptions').  But not when
@@ -364,13 +364,6 @@ N  *+mksession*		|:mksession|
 N  *+modify_fname*	|filename-modifiers|
 N  *+mouse*		Mouse handling |mouse-using|
 N  *+mouseshape*	|'mouseshape'|
-B  *+mouse_dec*		Unix only: Dec terminal mouse handling |dec-mouse|
-N  *+mouse_gpm*		Unix only: Linux console mouse handling |gpm-mouse|
-B  *+mouse_netterm*	Unix only: netterm mouse handling |netterm-mouse|
-N  *+mouse_sysmouse*	Unix only: *BSD console mouse handling |sysmouse|
-B  *+mouse_sgr*		Unix only: sgr mouse handling |sgr-mouse|
-B  *+mouse_urxvt*	Unix only: urxvt mouse handling |urxvt-mouse|
-N  *+mouse_xterm*	Unix only: xterm mouse handling |xterm-mouse|
 N  *+multi_byte*	16 and 32 bit characters |multibyte|
    *+multi_byte_ime*	Win32 input method for multibyte chars |multibyte-ime|
 N  *+multi_lang*	non-English language support |multi-lang|
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 4ad559600a..2bfd5f19a5 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -115,11 +115,14 @@ MS-DOS support:
 
 Other options:
   'macatsui'
-  'shortname'
   'shelltype'
+  'shortname'
   'termencoding'
   'textauto'
   'textmode'
+  'ttybuiltin'
+  'ttymouse'
+  'weirdinvert'
 
 Other commands:
   :fixdel
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 986d445b30..a7e9b945f4 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -560,8 +560,6 @@ call append("$", "\tmouse button is used for")
 call <SID>OptionG("mousem", &mousem)
 call append("$", "mousetime\tmaximum time in msec to recognize a double-click")
 call append("$", " \tset mouset=" . &mouset)
-call append("$", "ttymouse\t\"xterm\", \"xterm2\", \"dec\" or \"netterm\"; type of mouse")
-call <SID>OptionG("ttym", &ttym)
 if has("mouseshape")
   call append("$", "mouseshape\twhat the mouse pointer looks like in different modes")
   call <SID>OptionG("mouses", &mouses)
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 57a609e917..b200d43f73 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -29,19 +29,19 @@ syn keyword vimStdPlugin contained	DiffOrig Man N[ext] P[rint] S TOhtml XMLent X
 " vimOptions are caught only when contained in a vimSet {{{2
 syn keyword vimOption contained	acd ambiwidth arabicshape autowriteall backupdir bdlay binary breakat bufhidden cd ci cinw co commentstring confirm cpoptions cscoperelative csre cursorcolumn delcombine diffopt ea efm ep et fdc fdo ffs filetype fo foldlevelstart formatexpr ft gfw gtt guipty hh hkmap ic imaf iminsert includeexpr inf isident langmap lines lmap ma matchtime mco ml modeline mousefocus mousetime nrformats ofu para pdev pi previewwindow printmbfont qe relativenumber rightleftcmd ru sbr scrolloff selection shellcmdflag shellxescape showbreak si smartcase softtabstop spelllang sps sta su swb synmaxcol tagbsearch thesaurus titlestring tpm ttm ttytype undodir ut vfile vop wcm whichwrap wildignore winaltkeys winminwidth wmnu write
 syn keyword vimOption contained	ai ambw ari aw backupext beval brk buflisted cdpath cin cinwords cocu compatible cpt cscopetag cst cursorline dex digraph ead ei equalalways eventignore fde fdt fic fillchars foldclose foldmarker formatlistpat gcr ghr guicursor guitablabel hi hkmapp icon imak ims incsearch infercase isk keymap langmenu linespace loadplugins maxcombine mef mls modelines mousehide mp nu omnifunc paragraphs penc pm printdevice printoptions quoteescape remap rl ruf sc scrollopt selectmode shellpipe shellxquote showcmd sidescroll smartindent sol spellsuggest sr stal sua swf syntax taglength tbidi terse tildeop tl tr tty tw undofile vb vi wa wd wi wildignorecase window winwidth wmw writeany
-syn keyword vimOption contained	akm anti arshape awa backupskip bex browsedir buftype cedit cindent clipboard cole complete crb cscopetagorder csto cwh dg dip eadirection ek equalprg ex fdi fen fileencoding fk foldcolumn foldmethod formatoptions gd go guifont guitabtooltip hid hkp iconstring imc imsearch inde insertmode iskeyword keymodel laststatus lisp lpl magic maxfuncdepth menuitems mm modifiable mousem mps number opendevice paste pex pmbcs printencoding prompt rdt report rlc ruler scb scs sessionoptions shellquote shiftround showfulltag sidescrolloff smarttab sp spf srr startofline suffixes switchbuf ta tagrelative tbis textauto timeout tm ts tx undolevels vbs viewdir wak weirdinvert wic wildmenu winfixheight wiv wop writebackup
-syn keyword vimOption contained	al antialias autochdir background balloondelay bexpr bk bs casemap cf cink cmdheight colorcolumn completefunc copyindent cscopeverbose csverb debug dict dir eb enc errorbells expandtab fdl fenc fileencodings fkmap foldenable foldminlines formatprg gdefault gp guifontset helpfile hidden hl ignorecase imcmdline imsf indentexpr is isp keywordprg lazyredraw lispwords ls makeef maxmapdepth mfd mmd modified mousemodel msm numberwidth operatorfunc pastetoggle pexpr pmbfn printexpr pt re restorescreen rnu rulerformat scr sect sft shellredir shiftwidth showmatch siso smc spc spl ss statusline suffixesadd sws tabline tags tbs textmode timeoutlen to tsl uc undoreload vdir viewoptions warn wfh wig wildmode winfixwidth wiw wrap writedelay
-syn keyword vimOption contained	aleph ar autoindent backspace ballooneval bg bkc bsdir cb cfu cinkeys cmdwinheight columns completeopt cot cscopepathcomp cspc cuc deco dictionary directory ed encoding errorfile exrc fdls fencs fileformat flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imd imstatusfunc indentkeys isf isprint km lbr list lsp makeprg maxmem mh mmp more mouses nuw opfunc patchexpr pfn popt printfont pumheight readonly revins ro runtimepath scroll sections sh shellslash shm showmode sj smd spell splitbelow ssl stl sw sxe tabpagemax tagstack textwidth title toolbar tsr ttym udf updatecount ve viminfo wb wfw wildchar wildoptions winheight wm wrapmargin ws
-syn keyword vimOption contained	allowrevins arab autoread backup balloonexpr bh bl bsk cc ch cino cmp com concealcursor cp cscopeprg csprg cul def diff display endofline errorformat fcl fdm fex fileformats fml foldignore foldopen fs gfn grepprg guiheadroom helplang history hls imactivatefunc imdisable inc indk isfname joinspaces kmp lcs listchars lw mat maxmempattern mis mmt mouse mouseshape odev patchmode ph preserveindent printheader pvh redrawtime ri rs sb scrollbind secure shcf shelltemp shortmess showtabline slm spellcapcheck splitright ssop stmp swapfile sxq tabstop tal term titlelen toolbariconsize ttimeout ttymouse udir updatetime verbose virtualedit wc wh wildcharm wim winminheight wmh wrapscan ww
-syn keyword vimOption contained	altkeymap arabic autowrite backupcopy bdir bin bomb bt ccv charconvert cinoptions cms comments conceallevel cpo cscopequickfix csqf cursorbind define diffexpr dy ef eol esckeys fcs fdn ff fileignorecase fmr foldlevel foldtext fsync gfs gtl guioptions hf hk hlsearch imactivatekey imi include inex isi js kp linebreak lm lz matchpairs maxmemtot mkspellmem mod mousef mouset nf pa path pheader previewheight printmbcharset pvw regexpengine rightleft rtp sbo scrolljump sel shell shq sm so spellfile spr st sts swapsync syn tag tb termbidi tgst titleold top ttimeoutlen ttyscroll ul ur unnamedclip unc verbosefile visualbell 
+syn keyword vimOption contained	akm anti arshape awa backupskip bex browsedir buftype cedit cindent clipboard cole complete crb cscopetagorder csto cwh dg dip eadirection ek equalprg ex fdi fen fileencoding fk foldcolumn foldmethod formatoptions gd go guifont guitabtooltip hid hkp iconstring imc imsearch inde insertmode iskeyword keymodel laststatus lisp lpl magic maxfuncdepth menuitems mm modifiable mousem mps number opendevice paste pex pmbcs printencoding prompt rdt report rlc ruler scb scs sessionoptions shellquote shiftround showfulltag sidescrolloff smarttab sp spf srr startofline suffixes switchbuf ta tagrelative tbis textauto timeout tm ts tx undolevels vbs viewdir wak wic wildmenu winfixheight wop writebackup
+syn keyword vimOption contained	al antialias autochdir background balloondelay bexpr bk bs casemap cf cink cmdheight colorcolumn completefunc copyindent cscopeverbose csverb debug dict dir eb enc errorbells expandtab fdl fenc fileencodings fkmap foldenable foldminlines formatprg gdefault gp guifontset helpfile hidden hl ignorecase imcmdline imsf indentexpr is isp keywordprg lazyredraw lispwords ls makeef maxmapdepth mfd mmd modified mousemodel msm numberwidth operatorfunc pastetoggle pexpr pmbfn printexpr pt re restorescreen rnu rulerformat scr sect sft shellredir shiftwidth showmatch siso smc spc spl ss statusline suffixesadd sws tabline tags tbs textmode timeoutlen to uc undoreload vdir viewoptions warn wfh wig wildmode winfixwidth wiw wrap writedelay
+syn keyword vimOption contained	aleph ar autoindent backspace ballooneval bg bkc bsdir cb cfu cinkeys cmdwinheight columns completeopt cot cscopepathcomp cspc cuc deco dictionary directory ed encoding errorfile exrc fdls fencs fileformat flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imd imstatusfunc indentkeys isf isprint km lbr list lsp makeprg maxmem mh mmp more mouses nuw opfunc patchexpr pfn popt printfont pumheight readonly revins ro runtimepath scroll sections sh shellslash shm showmode sj smd spell splitbelow ssl stl sw sxe tabpagemax tagstack textwidth title toolbar tsr udf updatecount ve viminfo wb wfw wildchar wildoptions winheight wm wrapmargin ws
+syn keyword vimOption contained	allowrevins arab autoread backup balloonexpr bh bl bsk cc ch cino cmp com concealcursor cp cscopeprg csprg cul def diff display endofline errorformat fcl fdm fex fileformats fml foldignore foldopen fs gfn grepprg guiheadroom helplang history hls imactivatefunc imdisable inc indk isfname joinspaces kmp lcs listchars lw mat maxmempattern mis mmt mouse mouseshape odev patchmode ph preserveindent printheader pvh redrawtime ri rs sb scrollbind secure shcf shelltemp shortmess showtabline slm spellcapcheck splitright ssop stmp swapfile sxq tabstop tal term titlelen toolbariconsize ttimeout udir updatetime verbose virtualedit wc wh wildcharm wim winminheight wmh wrapscan ww
+syn keyword vimOption contained	altkeymap arabic autowrite backupcopy bdir bin bomb bt ccv charconvert cinoptions cms comments conceallevel cpo cscopequickfix csqf cursorbind define diffexpr dy ef eol esckeys fcs fdn ff fileignorecase fmr foldlevel foldtext fsync gfs gtl guioptions hf hk hlsearch imactivatekey imi include inex isi js kp linebreak lm lz matchpairs maxmemtot mkspellmem mod mousef mouset nf pa path pheader previewheight printmbcharset pvw regexpengine rightleft rtp sbo scrolljump sel shell shq sm so spellfile spr st sts swapsync syn tag tb termbidi tgst titleold top ttimeoutlen ul ur unnamedclip unc verbosefile visualbell 
 
 " vimOptions: These are the turn-off setting variants {{{2
-syn keyword vimOption contained	noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobinary nobk nobuflisted nocin noconfirm nocopyindent nocscoperelative nocsre nocuc nocursorcolumn nodelcombine nodigraph noendofline noerrorbells noex nofen nofk nogd nohid nohkmap nohkp nohlsearch noicon noim noimcmdline noimdisable noinf noinsertmode nojoinspaces nolazyredraw nolinebreak nolist nolpl noma nomagic noml nomodeline nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw norelativenumber norestorescreen nori norl noro noru nosb noscb noscs nosft noshelltemp noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbs noterse notextmode notgst notimeout noto notr notx noundofile novisualbell nowarn noweirdinvert nowfw nowildignorecase nowinfixheight nowiv nowrap nowrite nowritebackup
+syn keyword vimOption contained	noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobinary nobk nobuflisted nocin noconfirm nocopyindent nocscoperelative nocsre nocuc nocursorcolumn nodelcombine nodigraph noendofline noerrorbells noex nofen nofk nogd nohid nohkmap nohkp nohlsearch noicon noim noimcmdline noimdisable noinf noinsertmode nojoinspaces nolazyredraw nolinebreak nolist nolpl noma nomagic noml nomodeline nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw norelativenumber norestorescreen nori norl noro noru nosb noscb noscs nosft noshelltemp noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbs noterse notextmode notgst notimeout noto notr notx noundofile novisualbell nowarn nowfw nowildignorecase nowinfixheight nowrap nowrite nowritebackup
 syn keyword vimOption contained	noai noaltkeymap noar noarabicshape noautochdir noautowrite noawa nobeval nobl nocf nocindent nocp nocscopetag nocst nocul nocursorline nodg noea noeol noesckeys noexpandtab nofic nofkmap nogdefault nohidden nohkmapp nohls noic noignorecase noimc noimd noincsearch noinfercase nois nojs nolbr nolisp noloadplugins nolz nomh nomod nomodifiable nomore nomousefocus nonu noodev nopaste nopreserveindent noprompt noreadonly noremap norevins norightleft nornu nors noruler nosc noscrollbind nosecure noshellslash noshiftround noshowcmd noshowmatch nosi nosmartcase nosmarttab nospell nosplitright nosr nosta nostmp noswf notagbsearch notagstack notbidi notermbidi notextauto notildeop notitle notop nottimeout noudf novb nowa nowb nowfh nowic nowildmenu nowinfixwidth nowmnu nowrapscan nowriteany nows
 syn keyword vimOption contained	noakm noanti noarab noari noautoindent noautowriteall nobackup nobin nobomb noci nocompatible nocrb nocscopeverbose nocsverb nocursorbind nodeco nodiff noeb noek noequalalways noet noexrc nofileignorecase nofoldenable noguipty nohk 
 
 " vimOptions: These are the invertible variants {{{2
-syn keyword vimOption contained	invacd invallowrevins invantialias invarabic invarshape invautoread invaw invballooneval invbinary invbk invbuflisted invcin invconfirm invcopyindent invcscoperelative invcsre invcuc invcursorcolumn invdelcombine invdigraph invendofline inverrorbells invex invfen invfk invgd invhid invhkmap invhkp invhlsearch invicon invim invimcmdline invimdisable invinf invinsertmode invjoinspaces invlazyredraw invlinebreak invlist invlpl invma invmagic invml invmodeline invmodified invmousef invmousehide invnumber invopendevice invpi invpreviewwindow invpvw invrelativenumber invrestorescreen invri invrl invro invru invsb invscb invscs invsft invshelltemp invshowfulltag invshowmode invsm invsmartindent invsmd invsol invsplitbelow invspr invssl invstartofline invswapfile invta invtagrelative invtbs invterse invtextmode invtgst invtimeout invto invtr invtx invundofile invvisualbell invwarn invweirdinvert invwfw invwildignorecase invwinfixheight invwiv invwrap invwrite invwritebackup
+syn keyword vimOption contained	invacd invallowrevins invantialias invarabic invarshape invautoread invaw invballooneval invbinary invbk invbuflisted invcin invconfirm invcopyindent invcscoperelative invcsre invcuc invcursorcolumn invdelcombine invdigraph invendofline inverrorbells invex invfen invfk invgd invhid invhkmap invhkp invhlsearch invicon invim invimcmdline invimdisable invinf invinsertmode invjoinspaces invlazyredraw invlinebreak invlist invlpl invma invmagic invml invmodeline invmodified invmousef invmousehide invnumber invopendevice invpi invpreviewwindow invpvw invrelativenumber invrestorescreen invri invrl invro invru invsb invscb invscs invsft invshelltemp invshowfulltag invshowmode invsm invsmartindent invsmd invsol invsplitbelow invspr invssl invstartofline invswapfile invta invtagrelative invtbs invterse invtextmode invtgst invtimeout invto invtr invtx invundofile invvisualbell invwarn invwfw invwildignorecase invwinfixheight invwrap invwrite invwritebackup
 syn keyword vimOption contained	invai invaltkeymap invar invarabicshape invautochdir invautowrite invawa invbeval invbl invcf invcindent invcp invcscopetag invcst invcul invcursorline invdg invea inveol invesckeys invexpandtab invfic invfkmap invgdefault invhidden invhkmapp invhls invic invignorecase invimc invimd invincsearch invinfercase invis invjs invlbr invlisp invloadplugins invlz invmh invmod invmodifiable invmore invmousefocus invnu invodev invpaste invpreserveindent invprompt invreadonly invremap invrevins invrightleft invrnu invrs invruler invsc invscrollbind invsecure invshellslash invshiftround invshowcmd invshowmatch invsi invsmartcase invsmarttab invspell invsplitright invsr invsta invstmp invswf invtagbsearch invtagstack invtbidi invtermbidi invtextauto invtildeop invtitle invtop invttimeout invudf invvb invwa invwb invwfh invwic invwildmenu invwinfixwidth invwmnu invwrapscan invwriteany invws
 syn keyword vimOption contained	invakm invanti invarab invari invautoindent invautowriteall invbackup invbin invbomb invci invcompatible invcrb invcscopeverbose invcsverb invcursorbind invdeco invdiff inveb invek invequalalways invet invexrc invfileignorecase invfoldenable invguipty invhk 
 
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index d309b908f1..e7cb830e67 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -9965,13 +9965,6 @@ static void f_has(typval_T *argvars, typval_T *rettv)
     "mksession",
     "modify_fname",
     "mouse",
-#if defined(UNIX)
-    "mouse_dec",
-    "mouse_netterm",
-    "mouse_sgr",
-    "mouse_urxvt",
-    "mouse_xterm",
-#endif
     "multi_byte",
     "multi_lang",
     "path_extra",
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c
index 8def1bb2ad..0c5c24184e 100644
--- a/src/nvim/keymap.c
+++ b/src/nvim/keymap.c
@@ -256,10 +256,6 @@ static struct key_name_entry {
   {'<',               (char_u *)"lt"},
 
   {K_MOUSE,           (char_u *)"Mouse"},
-  {K_NETTERM_MOUSE,   (char_u *)"NetMouse"},
-  {K_DEC_MOUSE,       (char_u *)"DecMouse"},
-  {K_URXVT_MOUSE,     (char_u *)"UrxvtMouse"},
-  {K_SGR_MOUSE,       (char_u *)"SgrMouse"},
   {K_LEFTMOUSE,       (char_u *)"LeftMouse"},
   {K_LEFTMOUSE_NM,    (char_u *)"LeftMouseNM"},
   {K_LEFTDRAG,        (char_u *)"LeftDrag"},
diff --git a/src/nvim/keymap.h b/src/nvim/keymap.h
index c82a95c00c..022d27fda1 100644
--- a/src/nvim/keymap.h
+++ b/src/nvim/keymap.h
@@ -16,7 +16,7 @@
 
 /*
  * For MSDOS some keys produce codes larger than 0xff. They are split into two
- * chars, the first one is K_NUL (same value used in term_defs.h).
+ * chars, the first one is K_NUL.
  */
 #define K_NUL                   (0xce)  /* for MSDOS: special key follows */
 
@@ -78,12 +78,6 @@
 #define KS_HOR_SCROLLBAR        248
 
 /*
- * These are used for DEC mouse
- */
-#define KS_NETTERM_MOUSE        247
-#define KS_DEC_MOUSE            246
-
-/*
  * Used for switching Select mode back on after a mapping or menu.
  */
 #define KS_SELECT               245
@@ -103,12 +97,6 @@
 /* Used for menu in a tab pages line. */
 #define KS_TABMENU              239
 
-/* Used for the urxvt mouse. */
-#define KS_URXVT_MOUSE          238
-
-/* Used for the sgr mouse. */
-#define KS_SGR_MOUSE            237
-
 /*
  * Filler used after KS_SPECIAL and others
  */
@@ -407,11 +395,6 @@ enum key_extra {
 #define K_VER_SCROLLBAR TERMCAP2KEY(KS_VER_SCROLLBAR, KE_FILLER)
 #define K_HOR_SCROLLBAR   TERMCAP2KEY(KS_HOR_SCROLLBAR, KE_FILLER)
 
-#define K_NETTERM_MOUSE TERMCAP2KEY(KS_NETTERM_MOUSE, KE_FILLER)
-#define K_DEC_MOUSE     TERMCAP2KEY(KS_DEC_MOUSE, KE_FILLER)
-#define K_URXVT_MOUSE   TERMCAP2KEY(KS_URXVT_MOUSE, KE_FILLER)
-#define K_SGR_MOUSE     TERMCAP2KEY(KS_SGR_MOUSE, KE_FILLER)
-
 #define K_SELECT        TERMCAP2KEY(KS_SELECT, KE_FILLER)
 #define K_TEAROFF       TERMCAP2KEY(KS_TEAROFF, KE_FILLER)
 
diff --git a/src/nvim/main.c b/src/nvim/main.c
index ce96d2a7bf..5f0372f30e 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -100,7 +100,6 @@ typedef struct {
   bool headless;                        // Dont try to start an user interface
                                         // or read/write to stdio(unless
                                         // embedding)
-  char_u      *term;                    /* specified terminal name */
   int no_swap_file;                     /* "-n" argument used */
   int use_debug_break_level;
   int window_count;                     /* number of windows to use */
@@ -1123,7 +1122,6 @@ static void command_line_scan(mparm_T *parmp)
           /*FALLTHROUGH*/
         case 'S':                 /* "-S {file}" execute Vim script */
         case 'i':                 /* "-i {viminfo}" use for viminfo */
-        case 'T':                 /* "-T {terminal}" terminal name */
         case 'u':                 /* "-u {vimrc}" vim inits file */
         case 'U':                 /* "-U {gvimrc}" gvim inits file */
         case 'W':                 /* "-W {scriptout}" overwrite */
@@ -1221,15 +1219,6 @@ scripterror:
             parmp->tagname = (char_u *)argv[0];
             break;
 
-          case 'T':               /* "-T {terminal}" terminal name */
-            /*
-             * The -T term argument is always available and when
-             * HAVE_TERMLIB is supported it overrides the environment
-             * variable TERM.
-             */
-            parmp->term = (char_u *)argv[0];
-            break;
-
           case 'u':               /* "-u {vimrc}" vim inits file */
             parmp->use_vimrc = argv[0];
             break;
@@ -2001,7 +1990,6 @@ static void usage(void)
   mch_msg(_("  -n                    No swap file, use memory only\n"));
   mch_msg(_("  -r, -L                List swap files and exit\n"));
   mch_msg(_("  -r <file>             Recover crashed session\n"));
-  mch_msg(_("  -T <terminal>         Set terminal type to <terminal>\n"));
   mch_msg(_("  -u <nvimrc>           Use <nvimrc> instead of the default\n"));
   mch_msg(_("  -i <nviminfo>         Use <nviminfo> instead of the default\n"));
   mch_msg(_("  --noplugin            Don't load plugin scripts\n"));
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 9357bb1947..bb6acc79dc 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1545,13 +1545,6 @@ static vimoption_T
   {"ttyfast",  "tf",  P_BOOL|P_NO_MKRC|P_VI_DEF,
    (char_u *)&p_force_on, PV_NONE,
    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
-  {"ttymouse",    "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF,
-#if defined(FEAT_MOUSE) && defined(UNIX)
-   (char_u *)&p_ttym, PV_NONE,
-#else
-   (char_u *)NULL, PV_NONE,
-#endif
-   {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
   {"undodir",     "udir", P_STRING|P_EXPAND|P_COMMA|P_NODUP|P_SECURE|P_VI_DEF,
    (char_u *)&p_udir, PV_NONE,
    {(char_u *)".", (char_u *)0L}
@@ -3245,9 +3238,6 @@ static void didset_options(void)
   (void)opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, TRUE);
   (void)opt_strings_flags(p_dy, p_dy_values, &dy_flags, TRUE);
   (void)opt_strings_flags(p_ve, p_ve_values, &ve_flags, TRUE);
-#if defined(FEAT_MOUSE) && defined(UNIX)
-  (void)opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE);
-#endif
   (void)spell_check_msm();
   (void)spell_check_sps();
   (void)compile_cap_prog(curwin->w_s);
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 96824fdccf..70e3df0060 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -564,21 +564,6 @@ EXTERN char_u   *p_titlestring; /* 'titlestring' */
 EXTERN char_u   *p_tsr;         /* 'thesaurus' */
 EXTERN int p_ttimeout;          /* 'ttimeout' */
 EXTERN long p_ttm;              /* 'ttimeoutlen' */
-EXTERN long p_ttyscroll;        /* 'ttyscroll' */
-#if defined(FEAT_MOUSE) && defined(UNIX)
-EXTERN char_u   *p_ttym;        /* 'ttymouse' */
-EXTERN unsigned ttym_flags;
-# ifdef IN_OPTION_C
-static char *(p_ttym_values[]) =
-{"xterm", "xterm2", "dec", "netterm", "urxvt", "sgr", NULL};
-# endif
-# define TTYM_XTERM             0x01
-# define TTYM_XTERM2            0x02
-# define TTYM_DEC               0x04
-# define TTYM_NETTERM           0x08
-# define TTYM_URXVT             0x20
-# define TTYM_SGR               0x40
-#endif
 EXTERN char_u   *p_udir;        /* 'undodir' */
 EXTERN long p_ul;               /* 'undolevels' */
 EXTERN long p_ur;               /* 'undoreload' */
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 8b47d090d4..4442e7bba6 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -6448,11 +6448,6 @@ int screen_ins_lines (
   int j;
   unsigned temp;
 
-  // FAIL if
-  // - there is no valid screen
-  // - the screen has to be redrawn completely
-  // - the line count is less than one
-  // - the line count is more than 'ttyscroll'
   if (!screen_valid(TRUE) || line_count <= 0) {
     return FAIL;
   }
@@ -6507,11 +6502,6 @@ int screen_del_lines (
   int i;
   unsigned temp;
 
-  // FAIL if
-  // - there is no valid screen
-  // - the screen has to be redrawn completely
-  // - the line count is less than one
-  // - the line count is more than 'ttyscroll'
   if (!screen_valid(TRUE) || line_count <= 0) {
     return FAIL;
   }