* edit/edit.h: renamed edit() to edit_file() to avoid GCC shadow

warnings (many variables are also called edit).
	* edit/editwidget.c: likewise.
	* src/cmd.c: renamed edit() to edit_file() to avoid GCC shadow
	warnings (many variables are also called edit).
	* src/main.c: likewise.

edit/ChangeLog

@@ -5,6 +5,9 @@
 	* editcmd.c (edit_replace_prompt): Allocate the label text
 	dynamically instead of using catstrs. Don't handle
 	ENABLE_CHARSET specially.
+	* edit.h: renamed edit() to edit_file() to avoid GCC shadow
+	warnings (many variables are also called edit).
+	* editwidget.c: likewise.
 
 2004-09-17  Andrew V. Samoilov  <andrew@email.zp.ua>
 

edit/edit.h

@@ -131,7 +131,7 @@ void edit_init_menu_normal (void);
 void edit_done_menu (void);
 void menu_save_mode_cmd (void);
 int edit_raw_key_query (const char *heading, const char *query, int cancel);
-int edit (const char *_file, int line);
+int edit_file (const char *_file, int line);
 int edit_translate_key (WEdit *edit, long x_key, int *cmd, int *ch);
 
 #ifndef NO_INLINE_GETBYTE

edit/editwidget.c

@@ -163,7 +163,7 @@ edit_dialog_callback (Dlg_head *h, dlg_msg_t msg, int parm)
 }
 
 int
-edit (const char *_file, int line)
+edit_file (const char *_file, int line)
 {
     static int made_directory = 0;
     Dlg_head *edit_dlg;

src/ChangeLog

@@ -18,6 +18,9 @@
 	* widget.c: likewise.
 	* complete.c: Surrounded the declaration of environ by and #ifdef
 	guard to avoid a GCC warning about a redundant declaration.
+	* cmd.c: renamed edit() to edit_file() to avoid GCC shadow
+	warnings (many variables are also called edit).
+	* main.c: likewise.
 
 2004-09-19  Roland Illig  <roland.illig@gmx.de>
 

src/cmd.c

@@ -269,7 +269,7 @@ void do_edit_at_line (const char *what, int start_line)
 
 #ifdef USE_INTERNAL_EDIT
     if (use_internal_edit){
-	edit (what, start_line);
+	edit_file (what, start_line);
 	update_panels (UP_OPTIMIZE, UP_KEEPSEL);
 	repaint_screen ();
 	return;

src/main.c

@@ -1713,7 +1713,7 @@ mc_maybe_editor_or_viewer (void)
     else {
 	path = prepend_cwd_on_local ("");
 	setup_dummy_mc (path);
-	edit (edit_one_file, edit_one_file_start_line);
+	edit_file (edit_one_file, edit_one_file_start_line);
     }
 #endif				/* USE_INTERNAL_EDIT */
     g_free (path);