diff --git a/edit/ChangeLog b/edit/ChangeLog
index 453651518..1e5507911 100644
--- a/edit/ChangeLog
+++ b/edit/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-03  Pavel S. Shirshov <pavelsh@mail.ru>
+
+	* editwidget.c (edit_adjust_size): Fix warnings.
+	(edit_dialog_callback): Likewise.
+	edit.c (menu_save_mode_cmd): Likewise.
+
+	Based on patch from Jakub Jelinek  <jakub@redhat.com>
+
+
 2004-09-02  Pavel S. Shirshov <pavelsh@mail.ru>
 
 	* editcmd.c (edit_save_as_cmd): Add hotkey to dialog.
diff --git a/edit/editcmd.c b/edit/editcmd.c
index dd6695732..46cf1e325 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -388,7 +388,7 @@ void menu_save_mode_cmd (void)
 	{quick_label, 22, DLG_X, 4, DLG_Y, N_("Extension:"), 0,
 	 0, 0, 0, "savemext"},
 	{quick_radio, 4, DLG_X, 3, DLG_Y, "", 3,
-	 0, &save_mode_new, str, "t"},
+	 0, &save_mode_new, (char **) str, "t"},
 	NULL_QuickWidget};
     static QuickDialog dialog =
     {DLG_X, DLG_Y, -1, -1, N_(" Edit Save Mode "), "[Edit Save Mode]",
diff --git a/edit/editwidget.c b/edit/editwidget.c
index 85e3365ea..e282706b2 100644
--- a/edit/editwidget.c
+++ b/edit/editwidget.c
@@ -127,7 +127,7 @@ edit_adjust_size (Dlg_head *h)
     WEdit *edit;
     WButtonBar *edit_bar;
 
-    edit = (WEdit *) find_widget_type (h, edit_callback);
+    edit = (WEdit *) find_widget_type (h, (callback_fn) edit_callback);
     edit_bar = find_buttonbar (h);
 
     widget_set_size (&edit->widget, 0, 0, LINES - 1, COLS);
@@ -151,7 +151,7 @@ edit_dialog_callback (Dlg_head *h, dlg_msg_t msg, int parm)
 	return MSG_HANDLED;
 
     case DLG_VALIDATE:
-	edit = (WEdit *) find_widget_type (h, edit_callback);
+	edit = (WEdit *) find_widget_type (h, (callback_fn) edit_callback);
 	if (!edit_ok_to_exit (edit)) {
 	    h->running = 1;
 	}