diff --git a/edit/ChangeLog b/edit/ChangeLog
index ec0f364bb..c2eac16e3 100644
--- a/edit/ChangeLog
+++ b/edit/ChangeLog
@@ -1,5 +1,9 @@
 2005-05-03  Pavel Roskin  <proski@gnu.org>
 
+	* edit-widget.h: Use char instead of unsigned char to fix
+	warnings from gcc 4.0.
+	* editcmd.c: Likewise.
+
 	* edit.h: Use D_ERROR for edit_error_dialog, D_NORMAL for query
 	dialogs.  Remove unused edit_query_dialog4.
 
diff --git a/edit/edit-widget.h b/edit/edit-widget.h
index c4ecf6648..c74c300f1 100644
--- a/edit/edit-widget.h
+++ b/edit/edit-widget.h
@@ -37,8 +37,8 @@ struct WEdit {
     /* dynamic buffers and cursor position for editor: */
     long curs1;			/* position of the cursor from the beginning of the file. */
     long curs2;			/* position from the end of the file */
-    unsigned char *buffers1[MAXBUFF + 1];	/* all data up to curs1 */
-    unsigned char *buffers2[MAXBUFF + 1];	/* all data from end of file down to curs2 */
+    char *buffers1[MAXBUFF + 1];	/* all data up to curs1 */
+    char *buffers2[MAXBUFF + 1];	/* all data from end of file down to curs2 */
 
     /* search variables */
     long search_start;		/* First character to start searching from */
diff --git a/edit/editcmd.c b/edit/editcmd.c
index 4b28ec103..aebde8c38 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -60,8 +60,8 @@
 #define edit_get_save_file(f,h) input_expand_dialog (h, _(" Enter file name: "), f)
 
 struct selection {
-   unsigned char * text;
-   int len;
+    char *text;
+    int len;
 };
 
 /* globals: */
@@ -91,12 +91,13 @@ static inline int my_lower_case (int c)
     return tolower(c & 0xFF);
 }
 
-static const char *strcasechr (const unsigned char *s, int c)
+static const char *
+strcasechr (const char *s, int c)
 {
     for (c = my_lower_case (c); my_lower_case ((int) *s) != c; ++s)
 	if (*s == '\0')
 	    return 0;
-    return (const char *) s;
+    return s;
 }
 
 #ifndef HAVE_MEMMOVE