Index: trunk/src/netlist2.c
===================================================================
--- trunk/src/netlist2.c	(revision 23589)
+++ trunk/src/netlist2.c	(revision 23590)
@@ -302,7 +302,7 @@
 	pcb_any_obj_t *o;
 
 /* there can be multiple terminals with the same ID, but it is enough to run find from the first: find.c will consider them all */
-	o = pcb_term_find_name(pcb, pcb->Data, PCB_LYT_COPPER, term->refdes, term->term, 0, NULL, NULL);
+	o = pcb_term_find_name(pcb, pcb->Data, PCB_LYT_COPPER, term->refdes, term->term, NULL, NULL);
 	if (o == NULL) {
 		if (missing != NULL)
 			(*missing)++;
@@ -394,7 +394,7 @@
 	pcb_event(PCB_EVENT_NET_INDICATE_SHORT, "pppp", sctx->current_net, offender, offn, &handled);
 	if (!handled) {
 		pcb_net_term_t *orig_t = pcb_termlist_first(&sctx->current_net->conns);
-		pcb_any_obj_t *orig_o = pcb_term_find_name(sctx->pcb, sctx->pcb->Data, PCB_LYT_COPPER, orig_t->refdes, orig_t->term, 0, NULL, NULL);
+		pcb_any_obj_t *orig_o = pcb_term_find_name(sctx->pcb, sctx->pcb->Data, PCB_LYT_COPPER, orig_t->refdes, orig_t->term, NULL, NULL);
 
 		/* dummy fallback: warning-highlight the two terminals */
 		PCB_FLAG_SET(PCB_FLAG_WARN, offender);
@@ -681,7 +681,7 @@
 			pcb_net_term_t *t;
 			int has_selection = 0;
 			for(t = pcb_termlist_first(&net->conns); t != NULL; t = pcb_termlist_next(t)) {
-				pcb_any_obj_t *o = pcb_term_find_name(pcb, pcb->Data, PCB_LYT_COPPER, t->refdes, t->term, 0, NULL, NULL);
+				pcb_any_obj_t *o = pcb_term_find_name(pcb, pcb->Data, PCB_LYT_COPPER, t->refdes, t->term, NULL, NULL);
 				if ((o != NULL) && (PCB_FLAG_TEST(PCB_FLAG_SELECTED, o))) {
 					has_selection = 1;
 					break;
Index: trunk/src/obj_term.c
===================================================================
--- trunk/src/obj_term.c	(revision 23589)
+++ trunk/src/obj_term.c	(revision 23590)
@@ -280,7 +280,7 @@
 
 #define CHECK_TERM_LY(ob) \
 	do { \
-		if (PCB_NSTRCMP(term_name, ob->term) == 0 && (!same || !PCB_FLAG_TEST(PCB_FLAG_DRC, ob))) { \
+		if (PCB_NSTRCMP(term_name, ob->term) == 0) { \
 			if (parent_out != NULL) *parent_out = subc; \
 			if (gid_out != NULL) *gid_out = pcb_layer_get_group_(layer); \
 			return (pcb_any_obj_t *)ob; \
@@ -289,7 +289,7 @@
 
 #define CHECK_TERM_GL(ob) \
 	do { \
-		if (PCB_NSTRCMP(term_name, ob->term) == 0 && (!same || !PCB_FLAG_TEST(PCB_FLAG_DRC, ob))) { \
+		if (PCB_NSTRCMP(term_name, ob->term) == 0) { \
 			if (parent_out != NULL) *parent_out = subc; \
 			if (gid_out != NULL) { \
 				*gid_out = -1; \
@@ -299,7 +299,7 @@
 		} \
 	} while(0)
 
-pcb_any_obj_t *pcb_term_find_name(const pcb_board_t *pcb, pcb_data_t *data, pcb_layer_type_t lyt, const char *subc_name, const char *term_name, pcb_bool same, pcb_subc_t **parent_out, pcb_layergrp_id_t *gid_out)
+pcb_any_obj_t *pcb_term_find_name(const pcb_board_t *pcb, pcb_data_t *data, pcb_layer_type_t lyt, const char *subc_name, const char *term_name, pcb_subc_t **parent_out, pcb_layergrp_id_t *gid_out)
 {
 	pcb_subc_t *subc;
 	pcb_layer_t *layer;
Index: trunk/src/obj_term.h
===================================================================
--- trunk/src/obj_term.h	(revision 23589)
+++ trunk/src/obj_term.h	(revision 23590)
@@ -86,6 +86,6 @@
 /* Look up subc_name/term_name on layers matching lyt. Returns the object
    or NULL if not found. If the *out parameters are non-NULL, load them.
    Ignores subcircuits marked as nonetlist even if explicitly named. */
-pcb_any_obj_t *pcb_term_find_name(const pcb_board_t *pcb, pcb_data_t *data, pcb_layer_type_t lyt, const char *subc_name, const char *term_name, pcb_bool same, pcb_subc_t **parent_out, pcb_layergrp_id_t *gid_out);
+pcb_any_obj_t *pcb_term_find_name(const pcb_board_t *pcb, pcb_data_t *data, pcb_layer_type_t lyt, const char *subc_name, const char *term_name, pcb_subc_t **parent_out, pcb_layergrp_id_t *gid_out);
 
 #endif
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 23589)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 23590)
@@ -343,7 +343,7 @@
 				continue; /* no cost to go nowhere */
 
 			t = pcb_termlist_first(&net->conns);
-			obj = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t->refdes, t->term, 0, NULL, NULL);
+			obj = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t->refdes, t->term, NULL, NULL);
 			pcb_obj_center(obj, &maxx, &maxy);
 			minx = maxx;
 			miny = maxy;
@@ -353,7 +353,7 @@
 
 			for(t = pcb_termlist_next(t); t != NULL; t = pcb_termlist_next(t)) {
 				pcb_coord_t X, Y;
-				obj = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t->refdes, t->term, 0, NULL, NULL);
+				obj = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t->refdes, t->term, NULL, NULL);
 				pcb_obj_center(obj, &X, &Y);
 				PCB_MAKE_MIN(minx, X);
 				PCB_MAKE_MAX(maxx, X);
Index: trunk/src_plugins/dialogs/dlg_netlist.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_netlist.c	(revision 23589)
+++ trunk/src_plugins/dialogs/dlg_netlist.c	(revision 23590)
@@ -177,7 +177,7 @@
 	if (term != NULL) {
 		*term = '\0';
 		term++;
-		obj = pcb_term_find_name(ctx->pcb, ctx->pcb->Data, PCB_LYT_COPPER, refdes, term, 0, NULL, NULL);
+		obj = pcb_term_find_name(ctx->pcb, ctx->pcb->Data, PCB_LYT_COPPER, refdes, term, NULL, NULL);
 		if (obj != NULL) {
 			pcb_coord_t x, y;
 			pcb_obj_center(obj, &x, &y);
@@ -247,7 +247,7 @@
 		pcb_net_term_t *t;
 		vtp0_truncate(&netlist_color_save, 0);
 		for(t = pcb_termlist_first(&net->conns); t != NULL; t = pcb_termlist_next(t)) {
-			pcb_any_obj_t *obj = pcb_term_find_name(ctx->pcb, ctx->pcb->Data, PCB_LYT_COPPER, t->refdes, t->term, 0, NULL, NULL);
+			pcb_any_obj_t *obj = pcb_term_find_name(ctx->pcb, ctx->pcb->Data, PCB_LYT_COPPER, t->refdes, t->term, NULL, NULL);
 			if (obj == NULL)
 				continue;
 
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 23589)
+++ trunk/src_plugins/report/report.c	(revision 23590)
@@ -496,7 +496,7 @@
 
 		/* find the first terminal object referenced from the net that actually exist */
 		for(t = pcb_termlist_first(&net->conns); t != NULL; t = pcb_termlist_next(t)) {
-			term = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t->refdes, t->term, 0, NULL, NULL);
+			term = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t->refdes, t->term, NULL, NULL);
 			if (term != NULL)
 				break;
 		}
@@ -671,7 +671,7 @@
 				return 1;
 			}
 
-			obj = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, term->refdes, term->term, 0, NULL, NULL);
+			obj = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, term->refdes, term->term, NULL, NULL);
 			if (obj == NULL) {
 				pcb_message(PCB_MSG_INFO, "Net found, but its terminal %s-%s is not on the board.\n", term->refdes, term->term);
 				return 1;
Index: trunk/src_plugins/smartdisperse/smartdisperse.c
===================================================================
--- trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 23589)
+++ trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 23590)
@@ -156,8 +156,8 @@
 
 		t1 = pcb_termlist_first(&net->conns);
 		t2 = pcb_termlist_next(t2);
-		to1 = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t1->refdes, t1->term, 0, NULL, NULL);
-		to2 = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t2->refdes, t2->term, 0, NULL, NULL);
+		to1 = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t1->refdes, t1->term, NULL, NULL);
+		to2 = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t2->refdes, t2->term, NULL, NULL);
 
 		if ((to1 == NULL) || (to2 == NULL))
 			continue;
@@ -191,7 +191,7 @@
 			pcb_subc_t *parent;
 			pcb_any_obj_t *to;
 
-			to = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t->refdes, t->term, 0, NULL, NULL);
+			to = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, t->refdes, t->term, NULL, NULL);
 			if (to == NULL)
 				continue;