To: vim-dev@vim.org
Subject: Patch 6.1.466
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.466
Problem:    The "-f" argument is a bit obscure.
Solution:   Add the "--nofork" argument.  Improve the help text a bit.
Files:	    runtime/doc/starting.txt, src/main.c


*** ../vim61.465/runtime/doc/starting.txt	Fri Aug 30 22:33:37 2002
--- runtime/doc/starting.txt	Sun Apr 13 22:55:02 2003
***************
*** 1,4 ****
! *starting.txt*  For Vim version 6.1.  Last change: 2002 Aug 29
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *starting.txt*  For Vim version 6.1.  Last change: 2003 Apr 13
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 379,386 ****
  		but "-fg" is used to specify the foreground color.  |gui-fork|
  		{not in Vi}
  
  							*-u* *E282*
! -u {vimrc}	The file {vimrc} is read for initializations.  Other
  		initializations are skipped; see |initialization|.  This can
  		be used to start Vim in a special mode, with special
  		mappings and settings.  A shell alias can be used to make
--- 385,394 ----
  		but "-fg" is used to specify the foreground color.  |gui-fork|
  		{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
  		be used to start Vim in a special mode, with special
  		mappings and settings.  A shell alias can be used to make
*** ../vim61.465/src/main.c	Mon Mar 31 20:20:30 2003
--- src/main.c	Wed Apr 16 20:38:28 2003
***************
*** 542,547 ****
--- 542,548 ----
  				/* "--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)
***************
*** 559,564 ****
--- 560,571 ----
  		    literal = TRUE;
  #endif
  		}
+ 		else if (STRNICMP(argv[0] + argv_idx, "nofork", 6) == 0)
+ 		{
+ #ifdef FEAT_GUI
+ 		    gui.dofork = FALSE;	/* don't fork() when starting GUI */
+ #endif
+ 		}
  		else if (STRNICMP(argv[0] + argv_idx, "noplugin", 8) == 0)
  		    p_lpl = FALSE;
  #ifdef FEAT_PRECOMMANDS
***************
*** 2335,2341 ****
  #endif
  #ifdef FEAT_GUI
      main_msg(_("-g\t\t\tRun using GUI (like \"gvim\")"));
!     main_msg(_("-f\t\t\tForeground: Don't fork when starting GUI"));
  #endif
      main_msg(_("-v\t\t\tVi mode (like \"vi\")"));
      main_msg(_("-e\t\t\tEx mode (like \"ex\")"));
--- 2342,2348 ----
  #endif
  #ifdef FEAT_GUI
      main_msg(_("-g\t\t\tRun using GUI (like \"gvim\")"));
!     main_msg(_("-f  or  --nofork\tForeground: Don't fork when starting GUI"));
  #endif
      main_msg(_("-v\t\t\tVi mode (like \"vi\")"));
      main_msg(_("-e\t\t\tEx mode (like \"ex\")"));
***************
*** 2396,2404 ****
      main_msg(_("-display <display>\tConnect vim to this particular X-server"));
  # endif
      main_msg(_("-X\t\t\tDo not connect to X server"));
- # ifdef FEAT_GUI_GTK
-     main_msg(_("--socketid <xid>\tOpen Vim inside another GTK widget"));
- # endif
  #endif
  #ifdef FEAT_CLIENTSERVER
      main_msg(_("--remote <files>\tEdit <files> in a Vim server if possible"));
--- 2403,2408 ----
***************
*** 2413,2419 ****
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
  #endif
!     main_msg(_("-h\t\t\tPrint Help (this message) and exit"));
      main_msg(_("--version\t\tPrint version information and exit"));
  
  #ifdef FEAT_GUI_X11
--- 2417,2423 ----
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
  #endif
!     main_msg(_("-h  or  --help\tPrint Help (this message) and exit"));
      main_msg(_("--version\t\tPrint version information and exit"));
  
  #ifdef FEAT_GUI_X11
***************
*** 2452,2457 ****
--- 2456,2462 ----
  #endif
  #ifdef FEAT_GUI_GTK
      mch_msg(_("\nArguments recognised by gvim (GTK+ version):\n"));
+     main_msg(_("--socketid <xid>\tOpen Vim inside another GTK widget"));
      main_msg(_("-font <font>\t\tUse <font> for normal text (also: -fn)"));
      main_msg(_("-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"));
      main_msg(_("-reverse\t\tUse reverse video (also: -rv)"));
*** ../vim61.465/src/version.c	Wed Apr 16 20:28:13 2003
--- src/version.c	Wed Apr 16 20:40:54 2003
***************
*** 613,614 ****
--- 613,616 ----
  {   /* Add new patch number below this line */
+ /**/
+     466,
  /**/

-- 
For humans, honesty is a matter of degree.  Engineers are always honest in
matters of technology and human relationships.  That's why it's a good idea
to keep engineers away from customers, romantic interests, and other people
who can't handle the truth.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///