To: vim-dev@vim.org
Subject: Patch 6.3b.010
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.3b.010
Problem:    Win32: Using the "-D" argument and expanding arguments may cause a
	    hang, because the terminal isn't initialized yet. (Vince Negri)
Solution:   Don't go into debug mode before the terminal is initialized.
Files:	    src/main.c


*** ../vim-6.3b.009/src/main.c	Sun May 16 22:38:42 2004
--- src/main.c	Fri May 28 17:35:29 2004
***************
*** 113,118 ****
--- 113,119 ----
      int		i;
      char_u	*p = NULL;
      int		bin_mode = FALSE;	/* -b option used */
+     int		use_debug_break_level = -1;
  #ifdef FEAT_WINDOWS
      int		window_count = -1;	/* number of windows to use */
      int		arg_idx;		/* index in argument list */
***************
*** 781,787 ****
  
  #ifdef FEAT_EVAL
  	    case 'D':		/* "-D"		Debugging */
! 		debug_break_level = 9999;
  		break;
  #endif
  #ifdef FEAT_DIFF
--- 782,788 ----
  
  #ifdef FEAT_EVAL
  	    case 'D':		/* "-D"		Debugging */
! 		use_debug_break_level = 9999;
  		break;
  #endif
  #ifdef FEAT_DIFF
***************
*** 1290,1295 ****
--- 1291,1300 ----
  #ifdef FEAT_PRINTER
      parse_list_options(p_popt, printer_opts, OPT_PRINT_NUM_OPTIONS);
  #endif
+ 
+     /* Set the break level after the terminal is initialized. */
+     debug_break_level = use_debug_break_level;
+ 
  #ifdef FEAT_PRECOMMANDS
      if (p_commands > 0)
      {
*** ../vim-6.3b.009/src/version.c	Fri May 28 21:47:07 2004
--- src/version.c	Fri May 28 21:49:59 2004
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     10,
  /**/

-- 
If someone questions your market projections, simply point out that your
target market is "People who are nuts" and "People who will buy any damn
thing".  Nobody is going to tell you there aren't enough of those people
to go around.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///