diff -r 322402d9f9f9 -r 16d3598f611f mainwindow.cpp
--- a/mainwindow.cpp	Wed Jul 04 11:05:11 2007 +0000
+++ b/mainwindow.cpp	Wed Jul 04 11:05:15 2007 +0000
@@ -202,9 +202,9 @@
 	settings.setValue( "/version/builddate", vymBuildDate );
 
 	settings.setValue( "/mapeditor/autosave/use",actionSettingsAutosaveToggle->isOn() );
-	settings.setValue( "/mapeditor/editmode/autoSelectHeading",actionSettingsAutoSelectHeading->isOn() );
+	settings.setValue( "/mapeditor/editmode/autoSelectNewBranch",actionSettingsAutoSelectNewBranch->isOn() );
 	settings.setValue( "/mapeditor/editmode/autoSelectText",actionSettingsAutoSelectText->isOn() );
-	settings.setValue( "/mapeditor/editmode/autoEdit",actionSettingsAutoEdit->isOn() );
+	settings.setValue( "/mapeditor/editmode/autoEditNewBranch",actionSettingsAutoEditNewBranch->isOn() );
 	settings.setValue( "/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
 	settings.setValue( "/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
 	settings.setValue( "/export/useHideExport",actionSettingsUseHideExport->isOn() );
@@ -1451,16 +1451,16 @@
     a = new QAction( tr( "Edit branch after adding it","Settings action" ), this );
     a->setStatusTip( tr( "Edit branch after adding it" ));
 	a->setToggleAction(true);
-	a->setOn ( settings.value ("/mapeditor/editmode/autoEdit",true).toBool());
+	a->setOn ( settings.value ("/mapeditor/editmode/autoEditNewBranch",true).toBool());
 	settingsMenu->addAction (a);
-	actionSettingsAutoEdit=a;
+	actionSettingsAutoEditNewBranch=a;
 
     a= new QAction( tr( "Select branch after adding it","Settings action" ), this );
     a->setStatusTip( tr( "Select branch after adding it" ));
 	a->setToggleAction(true);
-	a->setOn ( settings.value ("/mapeditor/editmode/autoSelectHeading",false).toBool() );
+	a->setOn ( settings.value ("/mapeditor/editmode/autoSelectNewBranch",false).toBool() );
 	settingsMenu->addAction (a);
-	actionSettingsAutoSelectHeading=a;
+	actionSettingsAutoSelectNewBranch=a;
 	
     a= new QAction(tr( "Select existing heading","Settings action" ), this);
     a->setStatusTip( tr( "Select heading before editing" ));
@@ -2726,7 +2726,9 @@
 		lineedit->hide();
 		setFocus();
 #endif	
-		if (!prevSelection.isEmpty()) me->select(prevSelection);
+		if (!actionSettingsAutoSelectNewBranch->isOn() && 
+			!prevSelection.isEmpty()) 
+			me->select(prevSelection);
 		prevSelection="";
 	}
 }
@@ -2898,15 +2900,11 @@
 		else
 			return;
 
-		if (actionSettingsAutoEdit->isOn())
+		if (actionSettingsAutoEditNewBranch->isOn())
 		{
 			editHeading();
 			return;
 		}	
-			/*
-		if (!actionSettingsAutoSelectHeading->isOn())
-			me->select(bo->getSelectString());
-			*/	
 		if (!prevSelection.isEmpty()) 
 		{
 			me->select(prevSelection);
@@ -2929,9 +2927,9 @@
 		else
 			return;
 
-		if (actionSettingsAutoEdit->isOn())
+		if (actionSettingsAutoEditNewBranch->isOn())
 		{
-			if (!actionSettingsAutoSelectHeading->isOn())
+			if (!actionSettingsAutoSelectNewBranch->isOn())
 				prevSelection=bo->getSelectString();
 			editHeading();
 		}
@@ -2951,9 +2949,9 @@
 		else
 			return;
 
-		if (actionSettingsAutoEdit->isOn())
+		if (actionSettingsAutoEditNewBranch->isOn())
 		{
-			if (!actionSettingsAutoSelectHeading->isOn())
+			if (!actionSettingsAutoSelectNewBranch->isOn())
 				prevSelection=bo->getSelectString();
 			editHeading();
 		}
@@ -2973,9 +2971,9 @@
 		else
 			return;
 
-		if (actionSettingsAutoEdit->isOn())
+		if (actionSettingsAutoEditNewBranch->isOn())
 		{
-			if (!actionSettingsAutoSelectHeading->isOn())
+			if (!actionSettingsAutoSelectNewBranch->isOn())
 				prevSelection=bo->getSelectString();
 			editHeading();
 		}
@@ -3580,14 +3578,14 @@
 	return ModModeNone;
 }
 
-bool Main::autoEdit()
+bool Main::autoEditNewBranch()
 {
-	return actionSettingsAutoEdit->isOn();
+	return actionSettingsAutoEditNewBranch->isOn();
 }
 
-bool Main::autoSelectHeading()
+bool Main::autoSelectNewBranch()
 {
-	return actionSettingsAutoSelectHeading->isOn();
+	return actionSettingsAutoSelectNewBranch->isOn();
 }
 
 bool Main::useFlagGroups()
@@ -3684,7 +3682,7 @@
 	QStringList searchList;
 	QDir docdir;
 	#if defined(Q_OS_MACX)
-		searchList << "./vym.app/Contents";
+		searchList << "./vym.app/Contents/Resources/doc";
 	#else
 		// default path in SUSE LINUX
 		searchList <<"/usr/share/doc/packages/vym/doc";