Declaration of option_tab_spacing variable was moved from main.h to setup.h.

Includes were fixed.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

src/editor/edit.c

@@ -55,6 +55,7 @@
 #include "lib/timefmt.h"        /* time formatting */
 #include "src/charsets.h"       /* get_codepage_id */
 #include "src/main.h"           /* source_codepage */
+#include "src/setup.h"          /* option_tab_spacing */
 #include "src/learn.h"          /* learn_keys */
 #include "src/cmddef.h"
 #include "src/keybind.h"

src/editor/editcmd.c

@@ -57,6 +57,7 @@
 #include "src/widget.h"         /* listbox_new() */
 #include "src/layout.h"         /* clr_scr() */
 #include "src/main.h"           /* mc_home */
+#include "src/setup.h"          /* option_tab_spacing */
 #include "src/help.h"           /* interactive_display() */
 #include "src/wtools.h"         /* message() */
 #include "src/charsets.h"

src/editor/editdraw.c

@@ -40,20 +40,20 @@
 
 #include "lib/global.h"
 #include "lib/tty/tty.h"		/* tty_printf() */
-#include "lib/skin.h"
 #include "lib/tty/key.h"		/* is_idle() */
+#include "lib/skin.h"
 #include "lib/strutil.h"		/* utf string functions */
 
+#include "src/widget.h"			/* buttonbar_redraw() */
+#include "src/charsets.h"
+#include "src/main.h"			/* source_codepage */
+#include "src/setup.h"			/* edit_tab_spacing */
+
 #include "edit-impl.h"
 #include "edit-widget.h"
 
 #define MAX_LINE_LEN 1024
 
-
-#include "src/widget.h"		/* buttonbar_redraw() */
-#include "src/charsets.h"
-#include "src/main.h"		/* source_codepage */
-
 /* Text styles */
 #define MOD_ABNORMAL		(1 << 8)
 #define MOD_BOLD		(1 << 9)

src/editor/editoptions.c

@@ -37,7 +37,7 @@
 #include "edit-impl.h"
 #include "src/dialog.h"	/* B_CANCEL */
 #include "src/wtools.h"	/* QuickDialog */
-#include "src/main.h"	/* option_tab_spacing */
+#include "src/setup.h"	/* option_tab_spacing */
 
 #define OPT_DLG_H 16
 #define OPT_DLG_W 74

src/editor/wordproc.c

@@ -39,9 +39,10 @@
 
 #include "lib/global.h"
 
+#include "src/setup.h"	/* option_tab_spacing */
+
 #include "edit-impl.h"
 #include "edit-widget.h"
-#include "src/main.h"	/* option_tab_spacing */
 
 #define tab_width option_tab_spacing
 

src/main.h

@@ -56,10 +56,6 @@ extern int use_internal_view;
 extern int use_internal_edit;
 extern int clear_before_exec;
 
-/* TAB length for editor and viewer */
-#define DEFAULT_TAB_SPACING 8
-extern int option_tab_spacing;
-
 #ifdef HAVE_CHARSET
 extern int source_codepage;
 extern int default_source_codepage;

src/setup.h

@@ -25,6 +25,10 @@ extern int setup_copymove_persistent_attr;
 extern int num_history_items_recorded;
 extern int classic_progressbar;
 
+/* TAB length for editor and viewer */
+#define DEFAULT_TAB_SPACING 8
+extern int option_tab_spacing;
+
 char *setup_init (void);
 void load_setup (void);
 gboolean save_setup (void);

src/viewer/nroff.c

@@ -38,12 +38,14 @@
 #include <config.h>
 
 #include "lib/global.h"
-#include "src/main.h"
-#include "src/charsets.h"
 #include "lib/tty/tty.h"
 #include "lib/skin.h"
-#include "internal.h"
 
+#include "src/main.h"           /* utf8_display */
+#include "src/setup.h"          /* option_tab_spacing */
+#include "src/charsets.h"
+
+#include "internal.h"
 
 /*** global variables ****************************************************************************/
 

src/viewer/plain.c

@@ -38,16 +38,16 @@
 
 #include <config.h>
 
+#include "lib/global.h"
 #include "lib/tty/tty.h"
-
 #include "lib/skin.h"
 
-#include "lib/global.h"
-#include "src/main.h"
+#include "src/main.h"           /* utf8_display */
+#include "src/setup.h"          /* option_tab_spacing */
 #include "src/charsets.h"
-#include "mcviewer.h"           /* mcview_show_eof */
 
 #include "internal.h"
+#include "mcviewer.h"           /* mcview_show_eof */
 
 /*** global variables ****************************************************************************/