Remove `--nofork` / `-f` remnants

15 files changed, 2 insertions, 87 deletions

diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 8166919a51..94b5309fd6 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -158,9 +158,6 @@ framework, most notably iBus, have been known to produce undesirable results
 in gVim. These may include an inability to enter spaces, or long delays
 between typing a character and it being recognized by the application.
 
-One workaround that has been successful, for unknown reasons, is to prevent
-gvim from forking into the background by starting it with the |-f| argument.
-
 ==============================================================================
 2. Scrollbars						*gui-scrollbars*
 
diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt
index 51046e48d9..22a88c9f1e 100644
--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -40,25 +40,6 @@ The "-f" option runs Vim in the foreground.
 The "-b" option runs Vim in the background (this is the default).
 Also see |++opt| and |+cmd|.
 
-							*gui-fork*
-When the GUI is started, it does a fork() and exits the current process.
-When gvim was started from a shell this makes the shell accept further
-commands.  If you don't want this (e.g. when using gvim for a mail program
-that waits for gvim to exit), start gvim with "gvim -f", "vim -gf" or use
-":gui -f".  Don't use "vim -fg", because "-fg" specifies the foreground
-color.
-
-When using "gvim -f" and then ":gui", Vim will run in the foreground.  The
-"-f" argument will be remembered.  To force running Vim in the background use
-":gui -b".
-
-"gvim --nofork" does the same as "gvim -f".
-								*E851* *E852*
-When starting the GUI fails Vim will try to continue running in the terminal.
-
-If you want the GUI to run in the foreground always, include the 'f'
-flag in 'guioptions'.  |-f|.
-
 ==============================================================================
 2. GUI Resources			*gui-resources* *.Xdefaults*
 
diff --git a/runtime/doc/manpages/de/vim-de.1 b/runtime/doc/manpages/de/vim-de.1
index e956a22755..1b718e56ea 100644
--- a/runtime/doc/manpages/de/vim-de.1
+++ b/runtime/doc/manpages/de/vim-de.1
@@ -148,10 +148,6 @@ kein neues Fenster geöffnet. Dieser Parameter wird benutzt, damit das
 aufrufende Programm auf das Beenden des Bearbeitungssitzung wartet (z.B.:
 mail). Bei AmigaOS funktionieren die Befehle »:sh« und „:!« nicht.
 .TP 
-\-\-nofork
-Vordergrund: Bei der GUI\-Version erzeugt \fBVim\fP keinen neuen Prozess und
-löst sich nicht von der Shell, in der er aufgerufen wurde.
-.TP 
 \-F
 Wenn \fBVim\fP mit FKMAP\-Unterstützung für das Schreiben von rechts nach links
 und Farsi\-Tastatur\-Belegung kompiliert wurde, startet Vim im Farsi\-Modus,
diff --git a/runtime/doc/manpages/fr/vim-fr.1 b/runtime/doc/manpages/fr/vim-fr.1
index 158779de0c..6a864e070d 100644
--- a/runtime/doc/manpages/fr/vim-fr.1
+++ b/runtime/doc/manpages/fr/vim-fr.1
@@ -186,11 +186,6 @@ est exécuté par un programme qui attend la fin de la session d'édition
 (par exemple mail).
 Sur Amiga, les commandes ":sh" et ":!" ne fonctionneront pas.
 .TP
-\-\-nofork
-Premier-plan (Foreground). Pour la version graphique,
-.B Vim
-ne forkera pas et ne se détachera pas du shell dans lequel il a été lancé.
-.TP
 \-F
 Si
 .B Vim
diff --git a/runtime/doc/manpages/it/vim-it.1 b/runtime/doc/manpages/it/vim-it.1
index ad7ef51934..d252b4dada 100644
--- a/runtime/doc/manpages/it/vim-it.1
+++ b/runtime/doc/manpages/it/vim-it.1
@@ -182,11 +182,6 @@ Opzione da usare quando
 sessione di edit (ad es. mail).
 Sull'Amiga i comandi ":sh" e ":!" non sono disponibili.
 .TP
-\-\-nofork
-Direttamente [Foreground].  Per la versione GUI,
-.B Vim
-non crea [fork] una nuova finestra, indipendente dalla shell di invocazione.
-.TP
 \-F
 Se
 .B Vim
diff --git a/runtime/doc/manpages/ja/vim-ja.1 b/runtime/doc/manpages/ja/vim-ja.1
index 4bb432aae1..622caf0587 100644
--- a/runtime/doc/manpages/ja/vim-ja.1
+++ b/runtime/doc/manpages/ja/vim-ja.1
@@ -151,9 +151,6 @@ Amiga の場合は、新しいウィンドウで再起動しなくなります�
 を起動して、編集が終わるまで待機したいような場合に使ってください。
 Amiga では、":sh" と "!" コマンドは機能しなくなります。
 .TP
-\-\-nofork
-フォアグラウンド。GUI バージョンで、プロセスをフォークしなくなります。
-.TP
 \-F
 ペルシア語がサポートされていて、ペルシア語キーマップがある場合は、
 ペルシア語モードで起動します ('fkmap' と 'rightleft' がオンになります)。
diff --git a/runtime/doc/manpages/pl/vim-pl.1 b/runtime/doc/manpages/pl/vim-pl.1
index 71ba6e3ffa..6f2ea1e117 100644
--- a/runtime/doc/manpages/pl/vim-pl.1
+++ b/runtime/doc/manpages/pl/vim-pl.1
@@ -178,11 +178,6 @@ jest wywoływany przez program, który ma zaczekać na koniec sesji (np.
 mail).
 Na Amidze polecenia ":sh" i ":!" nie będą działać.
 .TP
-\-\-nofork
-Pierwszy plan. Dla wersji GUI.
-.B Vim
-nie oddzieli się od powłoki w jakiej został uruchomiony.
-.TP
 \-F
 Jeśli Vim został skompilowany ze wsparciem FKMAP dla edycji tekstów od
 prawej do lewej i mapowania klawiatury Farsi, ta opcja uruchomi
diff --git a/runtime/doc/manpages/ru/vim-ru.1 b/runtime/doc/manpages/ru/vim-ru.1
index 90bdeddc0c..34ab3e2b21 100644
--- a/runtime/doc/manpages/ru/vim-ru.1
+++ b/runtime/doc/manpages/ru/vim-ru.1
@@ -158,12 +158,6 @@ vim \- Vi IMproved (Улучшенный Vi), текстовый редакто�
 сеанса правки (например, программа для работы с электронной почтой).
 На платформе Amiga команды ":sh" и ":!" не будут работать.
 .TP
-\-\-nofork
-Режим активного приложения. Версия
-.B Vim
-с графическим интерфейсом не будет ветвиться и отключаться
-от запустившей её оболочки.
-.TP
 \-F
 Если
 .B Vim
diff --git a/runtime/doc/manpages/vim.1 b/runtime/doc/manpages/vim.1
index d4e9ab2ad8..c679068a69 100644
--- a/runtime/doc/manpages/vim.1
+++ b/runtime/doc/manpages/vim.1
@@ -164,11 +164,6 @@ This option should be used when
 is executed by a program that will wait for the edit
 session to finish (e.g. mail).
 .TP
-\-\-nofork
-Foreground.  For the GUI version,
-.B Vim
-will not fork and detach from the shell it was started in.
-.TP
 \-F
 If
 .B Vim
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 545a9dc828..f1676ab619 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3491,14 +3491,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 		When 'e' is missing a non-GUI tab pages line may be used.
 		The GUI tabs are only supported on some systems, currently
 		GTK, Motif, Mac OS/X and MS-Windows.
-								*'go-f'*
-	  'f'	Foreground: Don't use fork() to detach the GUI from the shell
-		where it was started.  Use this for programs that wait for the
-		editor to finish (e.g., an e-mail program).  Alternatively you
-		can use "gvim -f" or ":gui -f" to start the GUI in the
-		foreground.  |gui-fork|
-		Note: Set this option in the vimrc file.  The forking may have
-		happened already when the |gvimrc| file is read.
 								*'go-i'*
 	  'i'	Use a Vim icon.  For GTK with KDE it is used in the left-upper
 		corner of the window.  It's black&white on non-GTK, because of
diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt
index 73e955e834..2955a532fe 100644
--- a/runtime/doc/os_unix.txt
+++ b/runtime/doc/os_unix.txt
@@ -26,7 +26,6 @@ For executing external commands fork()/exec() is used when possible, otherwise
 system() is used, which is a bit slower.  The output of ":version" includes
 |+fork| when fork()/exec() is used, |+system()| when system() is used.  This
 can be changed at compile time.
-(For forking of the GUI version see |gui-fork|.)
 
 Because terminal updating under Unix is often slow (e.g. serial line
 terminal, shell window in suntools), the 'showcmd' and 'ruler' options
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 68a8e878a2..5e5b0d4fa5 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1143,7 +1143,6 @@ Context-sensitive completion on the command-line:
 |-r|	-r {file} ..	    recover aborted edit session
 |-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
 |-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)
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index bb555e1666..c34011f35b 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -359,24 +359,7 @@ argument.
 							*-d*
 -d		Start in |diff-mode|.
 
-							*-f*
--f		GUI: Do not disconnect from the program that started Vim.
-		'f' stands for "foreground".  If omitted, the GUI forks a new
-		process and exits the current one.  "-f" should be used when
-		gvim is started by a program that will wait for the edit
-		session to finish (e.g., mail or readnews).  If you want gvim
-		never to fork, include 'f' in 'guioptions' in your |gvimrc|.
-		Careful: You can use "-gf" to start the GUI in the foreground,
-		but "-fg" is used to specify the foreground color.  |gui-fork|
-
-		MS-Windows: This option is not supported.  However, when
-		running Vim with an installed vim.bat or gvim.bat file it
-		works.
-		{not in Vi}
-
 
-							*--nofork*
---nofork	GUI: Do not fork.  Same as |-f|.
 							*-u* *E282*
 -u {vimrc}	The file {vimrc} is read for initializations.  Most other
 		initializations are skipped; see |initialization|.  This can
@@ -529,8 +512,7 @@ X11 GUI support.  See |gui-resources|.
 ==============================================================================
 3. Initialization				*initialization* *startup*
 
-This section is about the non-GUI version of Vim.  See |gui-fork| for
-additional initialization when starting the GUI.
+This section is about the non-GUI version of Vim.
 
 At startup, Vim checks environment variables and files and sets values
 accordingly.  Vim proceeds in this order:
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 919002cffd..9b1657fd09 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -782,7 +782,7 @@ Only Vim is able to accept options in between and after the file names.
 
 --literal	Vim: take file names literally, don't expand wildcards.
 
---nofork	Vim: same as |-f|
+--nofork	Vim: same as -f
 
 --noplugin[s]	Vim: Skip loading plugins.
 
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 0b3402b682..d2d252a425 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -891,7 +891,6 @@ static void command_line_scan(mparm_T *parmp)
           /* "--help" give help message */
           /* "--version" give version message */
           /* "--literal" take files literally */
-          /* "--nofork" don't fork */
           /* "--noplugin[s]" skip plugins */
           /* "--cmd <cmd>" execute cmd before vimrc */
           if (STRICMP(argv[0] + argv_idx, "help") == 0)
@@ -923,7 +922,6 @@ static void command_line_scan(mparm_T *parmp)
 #if !defined(UNIX)
             parmp->literal = TRUE;
 #endif
-          } else if (STRNICMP(argv[0] + argv_idx, "nofork", 6) == 0) {
           } else if (STRNICMP(argv[0] + argv_idx, "noplugin", 8) == 0)
             p_lpl = FALSE;
           else if (STRNICMP(argv[0] + argv_idx, "cmd", 3) == 0) {