From a461d6b3b386d26d72611ffaa2371f67abd7d0af Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 12 Nov 2007 22:13:19 +0000
Subject: [PATCH] more keybinding/editing fixes

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2627 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour.bindings.in | 4 ++--
 gtk2_ardour/editor.cc          | 1 -
 gtk2_ardour/editor_keys.cc     | 2 ++
 gtk2_ardour/editor_ops.cc      | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gtk2_ardour/ardour.bindings.in b/gtk2_ardour/ardour.bindings.in
index c09bda173b..5c1900c357 100644
--- a/gtk2_ardour/ardour.bindings.in
+++ b/gtk2_ardour/ardour.bindings.in
@@ -199,12 +199,12 @@
 ; (gtk_accel_path "<Actions>/Snap/snap-to-edit-cursor" "")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "minus")
 ; (gtk_accel_path "<Actions>/JACK/Latency" "")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "F2")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<Shift>F2")
 ; (gtk_accel_path "<Actions>/redirectmenu/rename" "")
 ; (gtk_accel_path "<Actions>/RegionList/rlShowAuto" "")
 (gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<Control>p")
 ; (gtk_accel_path "<Actions>/Main/Session" "")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "F1")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<Shift>F1")
 ; (gtk_accel_path "<Actions>/Main/AudioFileFormat" "")
 ; (gtk_accel_path "<Actions>/Transport/Transport" "")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-timefx" "t")
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 4d865a7ede..b4ca43474c 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1938,7 +1938,6 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
 	select_items.push_back (MenuElem (_("Select All Within Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), true)));
 	select_items.push_back (MenuElem (_("Select Range Between Playhead & Edit Point"), mem_fun(*this, &Editor::select_range_between)));
 
-
 	select_items.push_back (SeparatorElem());
 
 	edit_items.push_back (MenuElem (_("Select"), *select_menu));
diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 065560aa54..d06b9f85aa 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -41,6 +41,8 @@ using namespace sigc;
 void
 Editor::keyboard_selection_finish (bool add)
 {
+	cerr << "here\n";
+
 	if (session && have_pending_keyboard_selection) {
 
 		nframes64_t end;
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 866ce58373..27642a7b60 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -880,7 +880,7 @@ Editor::edit_point_to_selection_start ()
 	Location* loc;
 	bool ignored;
 
-	if (!session || _edit_point != EditAtSelectedMarker || selection->markers.empty()) {
+	if (!session || selection->markers.empty()) {
 		return;
 	}
 
@@ -915,7 +915,7 @@ Editor::edit_point_to_selection_end ()
 	Location* loc;
 	bool ignored;
 
-	if (!session || _edit_point != EditAtSelectedMarker || selection->markers.empty()) {
+	if (!session || selection->markers.empty()) {
 		return;
 	}