*** Commands.cpp	2009-02-05 11:20:53.780691000 -0600
--- Commands_old.cpp	2007-05-07 14:24:29.000000000 -0500
***************
*** 20,26 ****
  
  static BOOL g_bEnableVim = TRUE;	// Vim enabled
  static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously
- static BOOL g_bNewTabs = FALSE;
  static int g_ChangeDir = CD_NONE;	// CD after file open?
  
  static void VimSetEnableState (BOOL bEnableState);
--- 20,25 ----
***************
*** 96,103 ****
  						       g_bEnableVim);
  			g_bDevStudioEditor = GetRegistryInt(hSectionKey,"DevStudioEditor",
  							    g_bDevStudioEditor);
- 			g_bNewTabs = GetRegistryInt(hSectionKey,"NewTabs",
- 							    g_bNewTabs);
  			g_ChangeDir = GetRegistryInt (hSectionKey, "ChangeDir",
  						      g_ChangeDir);
  			RegCloseKey (hSectionKey);
--- 95,100 ----
***************
*** 317,323 ****
  	enum { IDD = IDD_ADDINMAIN };
  	int	m_ChangeDir;
  	BOOL	m_bDevStudioEditor;
- 	BOOL	m_bNewTabs;
  	//}}AFX_DATA
  
  	//{{AFX_VIRTUAL(CMainDialog)
--- 314,319 ----
***************
*** 339,345 ****
  	//{{AFX_DATA_INIT(CMainDialog)
  	m_ChangeDir = -1;
  	m_bDevStudioEditor = FALSE;
- 	m_bNewTabs = FALSE;
  	//}}AFX_DATA_INIT
  }
  
--- 335,340 ----
***************
*** 349,355 ****
  	//{{AFX_DATA_MAP(CMainDialog)
  	DDX_Radio(pDX, IDC_CD_SOURCE_PATH, m_ChangeDir);
  	DDX_Check (pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);
-     DDX_Check (pDX, IDC_NEW_TABS, m_bNewTabs);
  	//}}AFX_DATA_MAP
  }
  
--- 344,349 ----
***************
*** 376,387 ****
  	CMainDialog Dlg;
  
  	Dlg.m_bDevStudioEditor = g_bDevStudioEditor;
- 	Dlg.m_bNewTabs = g_bNewTabs;
  	Dlg.m_ChangeDir = g_ChangeDir;
  	if (Dlg.DoModal () == IDOK)
  	{
  		g_bDevStudioEditor = Dlg.m_bDevStudioEditor;
- 		g_bNewTabs = Dlg.m_bNewTabs;
  		g_ChangeDir = Dlg.m_ChangeDir;
  
  		// Save settings to registry HKEY_CURRENT_USER\Software\Vim\VisVim
--- 370,379 ----
***************
*** 393,400 ****
  			{
  				WriteRegistryInt (hSectionKey, "DevStudioEditor",
  						  g_bDevStudioEditor);
- 				WriteRegistryInt (hSectionKey, "NewTabs",
- 						  g_bNewTabs);
  				WriteRegistryInt (hSectionKey, "ChangeDir", g_ChangeDir);
  				RegCloseKey (hSectionKey);
  			}
--- 385,390 ----
***************
*** 546,563 ****
  
  	// Make Vim open the file.
  	// In the filename convert all \ to /, put a \ before a space.
!     if (g_bNewTabs)
!     {
! 	    sprintf(VimCmd, ":tab :drop ");
! 	    s = VimCmd + 11;
!     }
!     else
!     {
!         sprintf(VimCmd, ":drop ");
!         s = VimCmd + 6;
!     }
! 
  	sprintf(FileNameTmp, "%S", (char *)FileName);
  	for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
  									  ++p)
  		if (*p == '\\')
--- 536,544 ----
  
  	// Make Vim open the file.
  	// In the filename convert all \ to /, put a \ before a space.
! 	sprintf(VimCmd, ":drop ");
  	sprintf(FileNameTmp, "%S", (char *)FileName);
+ 	s = VimCmd + 6;
  	for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
  									  ++p)
  		if (*p == '\\')
*** Resource.h	2009-02-05 11:13:51.119031000 -0600
--- Resource_old.h	2004-06-07 09:32:15.000000000 -0500
***************
*** 16,22 ****
  #define IDC_CD_SOURCE_PATH		1001
  #define IDC_CD_SOURCE_PARENT		1002
  #define IDC_CD_NONE			1003
- #define IDC_NEW_TABS		1004
  
  // Next default values for new objects
  //
--- 16,21 ----
*** VisVim.rc	2009-02-05 11:31:01.275624600 -0600
--- VisVim_old.rc	2004-06-07 09:32:15.000000000 -0500
***************
*** 122,130 ****
      CONTROL         "&Open file in DevStudio editor simultaneously",
                      IDC_DEVSTUDIO_EDITOR,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
                      WS_TABSTOP,7,7,153,10
-     CONTROL         "Open files in new tabs",
-                     IDC_NEW_TABS,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                     WS_TABSTOP,7,21,153,10
      GROUPBOX        "Current directory",IDC_STATIC,7,35,164,58,WS_GROUP
      CONTROL         "Set to &source file path",IDC_CD_SOURCE_PATH,"Button",
                      BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,49,85,10
--- 122,127 ----