Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 25206)
+++ trunk/src/gui_act.c	(revision 25207)
@@ -401,6 +401,7 @@
 		pcb_tool_select_by_id(PCB_MODE_ARC);
 		break;
 	case F_Arrow:
+	case F_None:
 		pcb_tool_select_by_id(PCB_MODE_ARROW);
 		break;
 	case F_Copy:
@@ -418,13 +419,10 @@
 	case F_Move:
 		pcb_tool_select_by_id(PCB_MODE_MOVE);
 		break;
-	case F_None:
-		pcb_tool_select_by_id(PCB_MODE_NO);
-		break;
 	case F_Cancel:
 		{
 			int saved_mode = conf_core.editor.mode;
-			pcb_tool_select_by_id(PCB_MODE_NO);
+			pcb_tool_select_by_id(PCB_MODE_ARROW);
 			pcb_tool_select_by_id(saved_mode);
 		}
 		break;
@@ -442,8 +440,8 @@
 			case PCB_MODE_RUBBERBAND_MOVE:
 			case PCB_MODE_THERMAL:
 			case PCB_MODE_LOCK:
-				pcb_tool_select_by_id(PCB_MODE_NO);
 				pcb_tool_select_by_id(PCB_MODE_ARROW);
+				pcb_tool_select_by_id(PCB_MODE_ARROW);
 				pcb_tool_note.Hit = pcb_tool_note.Click = 0; /* if the mouse button is still pressed, don't start selecting a box */
 				break;
 
@@ -452,7 +450,7 @@
 					pcb_tool_select_by_id(PCB_MODE_ARROW);
 				}
 				else {
-					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
 					pcb_tool_select_by_id(PCB_MODE_LINE);
 				}
 				break;
@@ -461,7 +459,7 @@
 				if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST)
 					pcb_tool_select_by_id(PCB_MODE_ARROW);
 				else {
-					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
 					pcb_tool_select_by_id(PCB_MODE_RECTANGLE);
 				}
 				break;
@@ -470,7 +468,7 @@
 				if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 					pcb_tool_select_by_id(PCB_MODE_ARROW);
 				else {
-					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
 					pcb_tool_select_by_id(PCB_MODE_POLYGON);
 				}
 				break;
@@ -479,7 +477,7 @@
 				if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 					pcb_tool_select_by_id(PCB_MODE_ARROW);
 				else {
-					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
 					pcb_tool_select_by_id(PCB_MODE_POLYGON_HOLE);
 				}
 				break;
@@ -488,7 +486,7 @@
 				if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST)
 					pcb_tool_select_by_id(PCB_MODE_ARROW);
 				else {
-					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
 					pcb_tool_select_by_id(PCB_MODE_ARC);
 				}
 				break;
Index: trunk/src/tool.c
===================================================================
--- trunk/src/tool.c	(revision 25206)
+++ trunk/src/tool.c	(revision 25207)
@@ -126,7 +126,7 @@
 	
 	if (PCB->RatDraw && !pcb_tool_get(id)->allow_when_drawing_ratlines) {
 		pcb_message(PCB_MSG_WARNING, "That mode is NOT allowed when drawing ratlines!\n");
-		id = PCB_MODE_NO;
+		id = PCB_MODE_ARROW;
 	}
 	
 	pcb_tool_prev_id = conf_core.editor.mode;
Index: trunk/src/tool.h
===================================================================
--- trunk/src/tool.h	(revision 25206)
+++ trunk/src/tool.h	(revision 25207)
@@ -33,7 +33,6 @@
 #include "pcb_bool.h"
 
 typedef enum {
-	PCB_MODE_NO              = -1,  /* no mode selected - panning - TODO: remove this in favor of the default mode (it's the same as the arrow mode) */
 	PCB_MODE_VIA             = 15,  /* draw vias */
 	PCB_MODE_LINE            = 5,   /* draw lines */
 	PCB_MODE_RECTANGLE       = 10,  /* create rectangles */
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 25206)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 25207)
@@ -2006,7 +2006,6 @@
 		if (s45 != NULL)
 			buf = pcb_strdup(s45);
 		break;
-	case PCB_MODE_NO:
 	case PCB_MODE_PASTE_BUFFER:
 	case PCB_MODE_ROTATE:
 	case PCB_MODE_REMOVE:
@@ -2239,10 +2238,6 @@
 
 			old_cursor_mode = conf_core.editor.mode;
 			switch (conf_core.editor.mode) {
-			case PCB_MODE_NO:
-				s = "None";
-				cursor = XC_X_cursor;
-				break;
 			case PCB_MODE_VIA:
 				s = "Via";
 				cursor = -1;
Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_topwin.c	(revision 25206)
+++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c	(revision 25207)
@@ -160,8 +160,6 @@
 gboolean ghid_idle_cb(void *topwin)
 {
 	pcb_gtk_topwin_t *tw = topwin;
-	if (conf_core.editor.mode == PCB_MODE_NO)
-		pcb_tool_select_by_id(PCB_MODE_ARROW);
 	tw->com->mode_cursor_main(conf_core.editor.mode);
 	return FALSE;
 }
Index: trunk/src_plugins/lib_gtk_common/in_mouse.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/in_mouse.c	(revision 25206)
+++ trunk/src_plugins/lib_gtk_common/in_mouse.c	(revision 25207)
@@ -138,10 +138,6 @@
 		mode = conf_core.editor.mode;
 
 	switch (mode) {
-	case PCB_MODE_NO:
-		gport_set_cursor(ctx, (GdkCursorType) CUSTOM_CURSOR_DRAG);
-		break;
-
 	case PCB_MODE_VIA:
 		gport_set_cursor(ctx, GDK_ARROW);
 		break;