* edit-widget.h: Move typedef WEdit and file names ...

* edit.h: ... here.  Don't include edit-widget.h.  Adjust all
dependencies.

edit/ChangeLog

@@ -1,3 +1,9 @@
+2002-11-28  Pavel Roskin  <proski@gnu.org>
+
+	* edit-widget.h: Move typedef WEdit and file names ...
+	* edit.h: ... here.  Don't include edit-widget.h.  Adjust all
+	dependencies.
+
 2002-11-23  Andrew V. Samoilov  <sav@bcs.zp.ua>
 
 	* editoptions.c (edit_options_dialog): Clean up and use g_snprintf()

edit/bookmark.c

@@ -23,6 +23,8 @@
 
 #include <config.h>
 #include "edit.h"
+#include "edit-widget.h"
+
 
 /* note, if there is more than one bookmark on a line, then they are
    appended after each other and the last one is always the one found

edit/edit-widget.h

@@ -38,7 +38,7 @@ struct _book_mark {
     struct _book_mark *prev;
 };
 
-typedef struct WEdit {
+struct WEdit {
     Widget widget;
 #define from_here num_widget_lines
     int num_widget_lines;
@@ -120,13 +120,6 @@ typedef struct WEdit {
     int macro_i;		/* -1 if not recording index to macro[] otherwise */
     int macro_depth;		/* depth of the macro recursion */
     struct macro macro[MAX_MACRO_LENGTH];
-} WEdit;
-
-#define EDIT_DIR           PATH_SEP_STR ".mc" PATH_SEP_STR "cedit"
-#define SYNTAX_FILE        EDIT_DIR PATH_SEP_STR "Syntax"
-#define CLIP_FILE          EDIT_DIR PATH_SEP_STR "cooledit.clip"
-#define MACRO_FILE         EDIT_DIR PATH_SEP_STR "cooledit.macros"
-#define BLOCK_FILE         EDIT_DIR PATH_SEP_STR "cooledit.block"
-#define TEMP_FILE          EDIT_DIR PATH_SEP_STR "cooledit.temp"
+};
 
 #endif /* !__EDIT_WIDGET_H */

edit/edit.c

@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include "edit.h"
+#include "edit-widget.h"
 
 #include "src/cmd.h"		/* view_other_cmd() */
 #include "src/user.h"		/* user_menu_cmd() */

edit/edit.h

@@ -43,7 +43,6 @@
 #endif
 
 #include "src/global.h"
-#include "edit-widget.h"	/* WEdit */
 
 #    define WIDGET_COMMAND (WIDGET_USER + 10)
 #    define N_menus 5
@@ -149,6 +148,9 @@ struct context_rule {
     struct key_word **keyword;
 };
 
+struct WEdit;
+typedef struct WEdit WEdit;
+
 int edit_drop_hotkey_menu (WEdit *e, int key);
 void edit_menu_cmd (WEdit *e);
 void edit_init_menu_emacs (void);
@@ -256,6 +258,7 @@ void edit_left_word_move (WEdit * edit, int s);
 void edit_right_word_move (WEdit * edit, int s);
 void edit_get_selection (WEdit * edit);
 
+struct macro;
 int edit_save_macro_cmd (WEdit * edit, struct macro macro[], int n);
 int edit_load_macro_cmd (WEdit * edit, struct macro macro[], int *n, int k);
 void edit_delete_macro_cmd (WEdit * edit);
@@ -361,4 +364,12 @@ extern char *option_backup_ext;
 extern int edit_confirm_save;
 extern int column_highlighting;
 
+/* File names */
+#define EDIT_DIR           PATH_SEP_STR ".mc" PATH_SEP_STR "cedit"
+#define SYNTAX_FILE        EDIT_DIR PATH_SEP_STR "Syntax"
+#define CLIP_FILE          EDIT_DIR PATH_SEP_STR "cooledit.clip"
+#define MACRO_FILE         EDIT_DIR PATH_SEP_STR "cooledit.macros"
+#define BLOCK_FILE         EDIT_DIR PATH_SEP_STR "cooledit.block"
+#define TEMP_FILE          EDIT_DIR PATH_SEP_STR "cooledit.temp"
+
 #endif 				/* __EDIT_H */

edit/editcmd.c

@@ -28,6 +28,7 @@
 
 #include "edit.h"
 #include "editcmddef.h"
+#include "edit-widget.h"
 
 #include "src/color.h"		/* dialog_colors */
 #include "src/tty.h"		/* LINES */

edit/editdraw.c

@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include "edit.h"
+#include "edit-widget.h"
 
 #define MAX_LINE_LEN 1024
 

edit/editmenu.c

@@ -29,6 +29,7 @@
 #include "src/key.h"		/* XCTRL */
 #include "src/main.h"		/* drop_menus */
 
+#include "edit-widget.h"
 #include "editcmddef.h"
 
 #undef edit_message_dialog

edit/editoptions.c

@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include "edit.h"
+#include "src/dlg.h"		/* B_CANCEL */
 #include "src/wtools.h"		/* QuickDialog */
 
 #define OPT_DLG_H 15

edit/editwidget.c

@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include "edit.h"
+#include "edit-widget.h"
 
 #include "src/tty.h"		/* LINES */
 #include "src/key.h"		/* get_modifier() */

edit/syntax.c

@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include "edit.h"
+#include "edit-widget.h"
 #include "src/color.h"		/* use_colors */
 #include "src/main.h"		/* mc_home */
 #include "src/wtools.h"		/* message() */

edit/wordproc.c

@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include "edit.h"
+#include "edit-widget.h"
 
 #define tab_width option_tab_spacing