Index: undo.c
===================================================================
--- undo.c	(revision 4861)
+++ undo.c	(revision 4862)
@@ -190,7 +190,7 @@
 
 #ifdef DEBUG_ID
 	if (SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, ID, Kind) == PCB_TYPE_NONE)
-		Message(PCB_MSG_DEFAULT, "hace: ID (%d) and Type (%x) mismatch in AddObject...\n", ID, Kind);
+		pcb_message(PCB_MSG_DEFAULT, "hace: ID (%d) and Type (%x) mismatch in AddObject...\n", ID, Kind);
 #endif
 
 	/* allocate memory */
@@ -206,7 +206,7 @@
 		if (size > limit) {
 			size_t l2;
 			l2 = (size / limit + 1) * limit;
-			Message(PCB_MSG_DEFAULT, _("Size of 'undo-list' exceeds %li kb\n"), (long) (l2 >> 10));
+			pcb_message(PCB_MSG_DEFAULT, _("Size of 'undo-list' exceeds %li kb\n"), (long) (l2 >> 10));
 		}
 	}
 
@@ -545,8 +545,8 @@
 			pcb_draw_obj(type, ptr1, ptr2);
 		return (pcb_true);
 	}
-	Message(PCB_MSG_DEFAULT, "hace Internal error: Can't find ID %d type %08x\n", Entry->ID, Entry->Kind);
-	Message(PCB_MSG_DEFAULT, "for UndoFlag Operation. Previous flags: %s\n", flags_to_string(Entry->Data.Flags, 0));
+	pcb_message(PCB_MSG_DEFAULT, "hace Internal error: Can't find ID %d type %08x\n", Entry->ID, Entry->Kind);
+	pcb_message(PCB_MSG_DEFAULT, "for UndoFlag Operation. Previous flags: %s\n", flags_to_string(Entry->Data.Flags, 0));
 	return (pcb_false);
 }
 
@@ -570,7 +570,7 @@
 			DrawElement(element);
 		return (pcb_true);
 	}
-	Message(PCB_MSG_DEFAULT, "hace Internal error: UndoMirror on object type %d\n", type);
+	pcb_message(PCB_MSG_DEFAULT, "hace Internal error: UndoMirror on object type %d\n", type);
 	return (pcb_false);
 }
 
@@ -881,12 +881,12 @@
 	andDraw = draw;
 
 	if (Serial == 0) {
-		Message(PCB_MSG_DEFAULT, _("ERROR: Attempt to Undo() with Serial == 0\n" "       Please save your work and report this bug.\n"));
+		pcb_message(PCB_MSG_DEFAULT, _("ERROR: Attempt to Undo() with Serial == 0\n" "       Please save your work and report this bug.\n"));
 		return 0;
 	}
 
 	if (UndoN == 0) {
-		Message(PCB_MSG_DEFAULT, _("Nothing to undo - buffer is empty\n"));
+		pcb_message(PCB_MSG_DEFAULT, _("Nothing to undo - buffer is empty\n"));
 		return 0;
 	}
 
@@ -895,7 +895,7 @@
 	ptr = &UndoList[UndoN - 1];
 
 	if (ptr->Serial > Serial) {
-		Message(PCB_MSG_DEFAULT, _("ERROR: Bad undo serial number %d in undo stack - expecting %d or lower\n"
+		pcb_message(PCB_MSG_DEFAULT, _("ERROR: Bad undo serial number %d in undo stack - expecting %d or lower\n"
 							"       Please save your work and report this bug.\n"), ptr->Serial, Serial);
 
 	/* It is likely that the serial number got corrupted through some bad
@@ -922,7 +922,7 @@
 	UnlockUndo();
 
 	if (error_undoing)
-		Message(PCB_MSG_DEFAULT, _("ERROR: Failed to undo some operations\n"));
+		pcb_message(PCB_MSG_DEFAULT, _("ERROR: Failed to undo some operations\n"));
 
 	if (Types && andDraw)
 		pcb_draw();
@@ -1063,7 +1063,7 @@
 	andDraw = draw;
 
 	if (RedoN == 0) {
-		Message(PCB_MSG_DEFAULT, _("Nothing to redo. Perhaps changes have been made since last undo\n"));
+		pcb_message(PCB_MSG_DEFAULT, _("Nothing to redo. Perhaps changes have been made since last undo\n"));
 		return 0;
 	}
 
@@ -1070,7 +1070,7 @@
 	ptr = &UndoList[UndoN];
 
 	if (ptr->Serial < Serial) {
-		Message(PCB_MSG_DEFAULT, _("ERROR: Bad undo serial number %d in redo stack - expecting %d or higher\n"
+		pcb_message(PCB_MSG_DEFAULT, _("ERROR: Bad undo serial number %d in redo stack - expecting %d or higher\n"
 							"       Please save your work and report this bug.\n"), ptr->Serial, Serial);
 
 		/* It is likely that the serial number got corrupted through some bad
@@ -1100,7 +1100,7 @@
 	UnlockUndo();
 
 	if (error_undoing)
-		Message(PCB_MSG_DEFAULT, _("ERROR: Failed to redo some operations\n"));
+		pcb_message(PCB_MSG_DEFAULT, _("ERROR: Failed to redo some operations\n"));
 
 	if (Types && andDraw)
 		pcb_draw();
@@ -1114,7 +1114,7 @@
 void RestoreUndoSerialNumber(void)
 {
 	if (added_undo_between_increment_and_restore)
-		Message(PCB_MSG_DEFAULT, _("ERROR: Operations were added to the Undo stack with an incorrect serial number\n"));
+		pcb_message(PCB_MSG_DEFAULT, _("ERROR: Operations were added to the Undo stack with an incorrect serial number\n"));
 	between_increment_and_restore = pcb_false;
 	added_undo_between_increment_and_restore = pcb_false;
 	Serial = SavedSerial;