* edit.c: Rename DELETE to DELCHAR to avoid macro redefinition

on Win32.
* edit.h: Likewise.

edit/ChangeLog

@@ -1,3 +1,9 @@
+2002-01-21  Pavel Roskin  <proski@gnu.org>
+
+	* edit.c: Rename DELETE to DELCHAR to avoid macro redefinition
+	on Win32.
+	* edit.h: Likewise.
+
 2002-01-21  Matthias Urban  <murban@cs.uni-magdeburg.de>
 
 	* edit.c: Add support for CK_Complete_Word event.

edit/edit.c

@@ -875,7 +875,7 @@ void edit_insert_ahead (WEdit * edit, int c)
 	edit->force |= REDRAW_AFTER_CURSOR;
     }
     edit_modification (edit);
-    edit_push_action (edit, DELETE);
+    edit_push_action (edit, DELCHAR);
 
     edit->mark1 += (edit->mark1 >= edit->curs1);
     edit->mark2 += (edit->mark2 >= edit->curs1);
@@ -1790,7 +1790,7 @@ void edit_do_undo (WEdit * edit)
 	case BACKSPACE:
 	    edit_backspace (edit);
 	    break;
-	case DELETE:
+	case DELCHAR:
 	    edit_delete (edit);
 	    break;
 	case COLUMN_ON:

edit/edit.h

@@ -136,7 +136,7 @@
 /*some codes that may be pushed onto or returned from the undo stack: */
 #define CURS_LEFT 601
 #define CURS_RIGHT 602
-#define DELETE 603
+#define DELCHAR 603
 #define BACKSPACE 604
 #define STACK_BOTTOM 605
 #define CURS_LEFT_LOTS 606