diff -urN mc-4.6.2_MDC/edit/bookmark.c mc-2009-03-28/edit/bookmark.c --- mc-4.6.2_MDC/edit/bookmark.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/bookmark.c 2009-03-28 08:40:38.000000000 +0000 @@ -33,7 +33,7 @@ #include #include -#include "../src/global.h" +#include "src/global.h" #include "edit.h" #include "edit-widget.h" diff -urN mc-4.6.2_MDC/edit/choosesyntax.c mc-2009-03-28/edit/choosesyntax.c --- mc-4.6.2_MDC/edit/choosesyntax.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/choosesyntax.c 2009-03-28 08:39:09.000000000 +0000 @@ -18,8 +18,8 @@ #include #include "edit.h" -#include "../src/global.h" -#include "../src/wtools.h" +#include "src/global.h" +#include "src/wtools.h" #define MAX_ENTRY_LEN 40 #define LIST_LINES 14 diff -urN mc-4.6.2_MDC/edit/edit.c mc-2009-03-28/edit/edit.c --- mc-4.6.2_MDC/edit/edit.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/edit.c 2009-03-28 09:53:23.000000000 +0000 @@ -32,20 +32,21 @@ #include #include -#include +#include "mhl/string.h" -#include "../src/global.h" +#include "src/global.h" #include "edit.h" #include "editlock.h" #include "edit-widget.h" #include "editcmddef.h" +#include "editmlm.h" #include "usermap.h" -#include "../src/cmd.h" /* view_other_cmd() */ -#include "../src/user.h" /* user_menu_cmd() */ -#include "../src/wtools.h" /* query_dialog() */ -#include "../src/timefmt.h" /* time formatting */ +#include "src/cmd.h" /* view_other_cmd() */ +#include "src/user.h" /* user_menu_cmd() */ +#include "src/wtools.h" /* query_dialog() */ +#include "src/timefmt.h" /* time formatting */ /* @@ -54,11 +55,11 @@ */ int edit_key_emulation = EDIT_KEY_EMULATION_NORMAL; -int option_word_wrap_line_length = 72; +int option_word_wrap_line_length = 99; int option_typewriter_wrap = 0; int option_auto_para_formatting = 0; -int option_tab_spacing = 8; -int option_fill_tabs_with_spaces = 0; +int option_tab_spacing = 4; +int option_fill_tabs_with_spaces = 1; int option_return_does_auto_indent = 1; int option_backspace_through_tabs = 0; int option_fake_half_tabs = 1; diff -urN mc-4.6.2_MDC/edit/editcmd.c mc-2009-03-28/edit/editcmd.c --- mc-4.6.2_MDC/edit/editcmd.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/editcmd.c 2009-03-28 09:09:31.000000000 +0000 @@ -37,27 +37,27 @@ #include #include -#include +#include "mhl/string.h" -#include "../src/global.h" -#include "../src/history.h" +#include "src/global.h" +#include "src/history.h" #include "edit.h" #include "editlock.h" #include "editcmddef.h" #include "edit-widget.h" -#include "../src/color.h" /* dialog_colors */ -#include "../src/tty.h" /* LINES */ -#include "../src/widget.h" /* listbox_new() */ -#include "../src/layout.h" /* clr_scr() */ -#include "../src/main.h" /* mc_home */ -#include "../src/help.h" /* interactive_display() */ -#include "../src/key.h" /* XCTRL */ -#include "../src/dialog.h" /* do_refresh() */ -#include "../src/wtools.h" /* message() */ -#include "../src/charsets.h" -#include "../src/selcodepage.h" +#include "src/color.h" /* dialog_colors */ +#include "src/tty.h" /* LINES */ +#include "src/widget.h" /* listbox_new() */ +#include "src/layout.h" /* clr_scr() */ +#include "src/main.h" /* mc_home */ +#include "src/help.h" /* interactive_display() */ +#include "src/key.h" /* XCTRL */ +#include "src/dialog.h" /* do_refresh() */ +#include "src/wtools.h" /* message() */ +#include "src/charsets.h" +#include "src/selcodepage.h" struct selection { unsigned char * text; diff -urN mc-4.6.2_MDC/edit/editdraw.c mc-2009-03-28/edit/editdraw.c --- mc-4.6.2_MDC/edit/editdraw.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/editdraw.c 2009-03-28 08:39:25.000000000 +0000 @@ -34,18 +34,18 @@ #include #include -#include "../src/global.h" +#include "src/global.h" #include "edit.h" #include "edit-widget.h" #define MAX_LINE_LEN 1024 -#include "../src/color.h" /* EDITOR_NORMAL_COLOR */ -#include "../src/tty.h" /* attrset() */ -#include "../src/widget.h" /* buttonbar_redraw() */ -#include "../src/key.h" /* is_idle() */ -#include "../src/charsets.h" +#include "src/color.h" /* EDITOR_NORMAL_COLOR */ +#include "src/tty.h" /* attrset() */ +#include "src/widget.h" /* buttonbar_redraw() */ +#include "src/key.h" /* is_idle() */ +#include "src/charsets.h" /* Text styles */ #define MOD_ABNORMAL (1 << 8) diff -urN mc-4.6.2_MDC/edit/editkeys.c mc-2009-03-28/edit/editkeys.c --- mc-4.6.2_MDC/edit/editkeys.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/editkeys.c 2009-03-28 08:40:22.000000000 +0000 @@ -35,15 +35,15 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "edit.h" #include "edit-widget.h" /* edit->macro_i */ #include "editcmddef.h" /* list of commands */ -#include "../src/key.h" /* KEY_M_SHIFT */ -#include "../src/tty.h" /* keys */ -#include "../src/charsets.h" /* convert_from_input_c() */ -#include "../src/selcodepage.h" /* do_select_codepage() */ +#include "src/key.h" /* KEY_M_SHIFT */ +#include "src/tty.h" /* keys */ +#include "src/charsets.h" /* convert_from_input_c() */ +#include "src/selcodepage.h" /* do_select_codepage() */ /* * Ordinary translations. Note that the keys listed first take priority diff -urN mc-4.6.2_MDC/edit/editlock.c mc-2009-03-28/edit/editlock.c --- mc-4.6.2_MDC/edit/editlock.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/editlock.c 2009-03-28 08:39:52.000000000 +0000 @@ -37,12 +37,12 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "edit.h" #include "editlock.h" -#include "../src/wtools.h" /* edit_query_dialog () */ +#include "src/wtools.h" /* edit_query_dialog () */ #define BUF_SIZE 255 #define PID_BUF_SIZE 10 diff -urN mc-4.6.2_MDC/edit/editmenu.c mc-2009-03-28/edit/editmenu.c --- mc-4.6.2_MDC/edit/editmenu.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/editmenu.c 2009-03-28 08:30:08.000000000 +0000 @@ -36,16 +36,16 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "edit.h" -#include "../src/cmd.h" /* save_setup_cmd() */ -#include "../src/wtools.h" /* query_dialog() */ -#include "../src/menu.h" /* menu_entry */ -#include "../src/tty.h" /* KEY_F */ -#include "../src/key.h" /* XCTRL */ -#include "../src/main.h" /* drop_menus */ -#include "../src/learn.h" /* learn_keys */ +#include "src/cmd.h" /* save_setup_cmd() */ +#include "src/wtools.h" /* query_dialog() */ +#include "src/menu.h" /* menu_entry */ +#include "src/tty.h" /* KEY_F */ +#include "src/key.h" /* XCTRL */ +#include "src/main.h" /* drop_menus */ +#include "src/learn.h" /* learn_keys */ #include "edit-widget.h" #include "editcmddef.h" diff -urN mc-4.6.2_MDC/edit/editoptions.c mc-2009-03-28/edit/editoptions.c --- mc-4.6.2_MDC/edit/editoptions.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/editoptions.c 2009-03-28 08:39:44.000000000 +0000 @@ -36,12 +36,12 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "edit.h" #include "usermap.h" -#include "../src/dialog.h" /* B_CANCEL */ -#include "../src/wtools.h" /* QuickDialog */ +#include "src/dialog.h" /* B_CANCEL */ +#include "src/wtools.h" /* QuickDialog */ #define OPT_DLG_H 17 #define OPT_DLG_W 72 diff -urN mc-4.6.2_MDC/edit/editwidget.c mc-2009-03-28/edit/editwidget.c --- mc-4.6.2_MDC/edit/editwidget.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/editwidget.c 2009-03-28 09:13:52.000000000 +0000 @@ -35,17 +35,17 @@ #include #include -#include +#include "mhl/string.h" -#include "../src/global.h" +#include "src/global.h" #include "edit.h" #include "edit-widget.h" -#include "../src/tty.h" /* LINES */ -#include "../src/widget.h" /* buttonbar_redraw() */ -#include "../src/menu.h" /* menubar_new() */ -#include "../src/key.h" /* is_idle() */ +#include "src/tty.h" /* LINES */ +#include "src/widget.h" /* buttonbar_redraw() */ +#include "src/menu.h" /* menubar_new() */ +#include "src/key.h" /* is_idle() */ WEdit *wedit; struct WMenu *edit_menubar; diff -urN mc-4.6.2_MDC/edit/edit-widget.h mc-2009-03-28/edit/edit-widget.h --- mc-4.6.2_MDC/edit/edit-widget.h 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/edit-widget.h 2009-03-28 08:57:37.000000000 +0000 @@ -1,8 +1,9 @@ #ifndef MC_EDIT_WIDGET_H #define MC_EDIT_WIDGET_H -#include "../src/dialog.h" /* Widget */ +//»#include "../src/dialog.h" /* Widget */ #include "edit.h" +#include "src/dialog.h" /* Widget */ #define MAX_MACRO_LENGTH 1024 #define N_LINE_CACHES 32 diff -urN mc-4.6.2_MDC/edit/syntax.c mc-2009-03-28/edit/syntax.c --- mc-4.6.2_MDC/edit/syntax.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/syntax.c 2009-03-28 09:13:45.000000000 +0000 @@ -32,15 +32,15 @@ #include #include -#include +#include "mhl/string.h" -#include "../src/global.h" +#include "src/global.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() */ +#include "src/color.h" /* use_colors */ +#include "src/main.h" /* mc_home */ +#include "src/wtools.h" /* message() */ /* bytes */ #define SYNTAX_MARKER_DENSITY 512 diff -urN mc-4.6.2_MDC/edit/usermap.c mc-2009-03-28/edit/usermap.c --- mc-4.6.2_MDC/edit/usermap.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/usermap.c 2009-03-28 09:13:57.000000000 +0000 @@ -30,18 +30,18 @@ #include #include -#include +#include "mhl/string.h" -#include "../src/global.h" +#include "src/global.h" #include "edit.h" #include "edit-widget.h" #include "editcmddef.h" /* list of commands */ #include "usermap.h" -#include "../src/key.h" /* KEY_M_* */ -#include "../src/tty.h" /* keys */ -#include "../src/wtools.h" -#include "../src/widget.h" /* buttonbar_redraw() */ +#include "src/key.h" /* KEY_M_* */ +#include "src/tty.h" /* keys */ +#include "src/wtools.h" +#include "src/widget.h" /* buttonbar_redraw() */ typedef struct NameMap { const char *name; diff -urN mc-4.6.2_MDC/edit/wordproc.c mc-2009-03-28/edit/wordproc.c --- mc-4.6.2_MDC/edit/wordproc.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/edit/wordproc.c 2009-03-28 08:39:17.000000000 +0000 @@ -33,7 +33,7 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "edit.h" #include "edit-widget.h" diff -urN mc-4.6.2_MDC/maint/template.c mc-2009-03-28/maint/template.c --- mc-4.6.2_MDC/maint/template.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/maint/template.c 2009-03-28 08:31:52.000000000 +0000 @@ -28,7 +28,7 @@ #include /* see maint/headers.txt for details */ -#include "../src/global.h" +#include "src/global.h" #include "..." /*** global variables **************************************************/ diff -urN mc-4.6.2_MDC/mhl/env.h mc-2009-03-28/mhl/env.h --- mc-4.6.2_MDC/mhl/env.h 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/mhl/env.h 2009-03-28 09:15:24.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef __MHL_ENV_H #define __MHL_ENV_H -#include +#include "mhl/string.h" #define mhl_getenv_dup(name) (mhl_str_dup(name ? getenv(name) : "")) diff -urN mc-4.6.2_MDC/mhl/escape.h mc-2009-03-28/mhl/escape.h --- mc-4.6.2_MDC/mhl/escape.h 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/mhl/escape.h 2009-03-28 09:16:17.000000000 +0000 @@ -6,7 +6,7 @@ #include #include -#include +#include "mhl/types.h" #define mhl_shell_escape_toesc(x) \ (((x)==' ')||((x)=='!')||((x)=='#')||((x)=='$')||((x)=='%')|| \ diff -urN mc-4.6.2_MDC/mhl/strhash.h mc-2009-03-28/mhl/strhash.h --- mc-4.6.2_MDC/mhl/strhash.h 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/mhl/strhash.h 2009-03-28 09:15:53.000000000 +0000 @@ -2,7 +2,7 @@ #define __MHL_STRHASH_H #include -#include +#include "mhl/memory.h" static void __mhl_strhash_free_key(void* ptr) { diff -urN mc-4.6.2_MDC/mhl/string.h mc-2009-03-28/mhl/string.h --- mc-4.6.2_MDC/mhl/string.h 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/mhl/string.h 2009-03-28 09:15:41.000000000 +0000 @@ -4,7 +4,7 @@ #include #include #include -#include +#include "mhl/memory.h" #define mhl_str_dup(str) ((str ? strdup(str) : strdup(""))) #define mhl_str_ndup(str,len) ((str ? strndup(str,len) : strdup(""))) diff -urN mc-4.6.2_MDC/src/boxes.c mc-2009-03-28/src/boxes.c --- mc-4.6.2_MDC/src/boxes.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/boxes.c 2009-03-28 08:34:33.000000000 +0000 @@ -56,11 +56,11 @@ #endif #ifdef USE_NETCODE -# include "../vfs/ftpfs.h" +# include "vfs/ftpfs.h" #endif #ifdef USE_VFS -#include "../vfs/gc.h" +#include "vfs/gc.h" #endif static int DISPLAY_X = 45, DISPLAY_Y = 14; diff -urN mc-4.6.2_MDC/src/charsets.c mc-2009-03-28/src/charsets.c --- mc-4.6.2_MDC/src/charsets.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/charsets.c 2009-03-28 09:10:47.000000000 +0000 @@ -27,7 +27,7 @@ #include -#include +#include "mhl/string.h" #include "global.h" #include "charsets.h" diff -urN mc-4.6.2_MDC/src/cmd.c mc-2009-03-28/src/cmd.c --- mc-4.6.2_MDC/src/cmd.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/cmd.c 2009-03-28 09:12:21.000000000 +0000 @@ -34,7 +34,7 @@ #endif #include -#include +#include "mhl/string.h" #include "global.h" #include "cmd.h" /* Our definitions */ @@ -70,7 +70,7 @@ #endif #ifdef USE_INTERNAL_EDIT -# include "../edit/edit.h" +# include "edit/edit.h" #endif /* If set and you don't have subshell support,then C-o will give you a shell */ @@ -1361,4 +1361,3 @@ set_basic_panel_listing_to (current, (p->list_type + 1) % LIST_TYPES); } - diff -urN mc-4.6.2_MDC/src/command.c mc-2009-03-28/src/command.c --- mc-4.6.2_MDC/src/command.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/command.c 2009-03-28 09:14:35.000000000 +0000 @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include "mhl/memory.h" +#include "mhl/string.h" +#include "mhl/escape.h" #include "global.h" /* home_dir */ #include "tty.h" @@ -318,4 +318,3 @@ stuff (in, quoted_text, insert_extra_space); g_free (quoted_text); } - diff -urN mc-4.6.2_MDC/src/complete.c mc-2009-03-28/src/complete.c --- mc-4.6.2_MDC/src/complete.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/complete.c 2009-03-28 09:11:23.000000000 +0000 @@ -30,9 +30,9 @@ #include #include -#include -#include -#include +#include "mhl/memory.h" +#include "mhl/escape.h" +#include "mhl/string.h" #include "global.h" #include "tty.h" diff -urN mc-4.6.2_MDC/src/cons.handler.c mc-2009-03-28/src/cons.handler.c --- mc-4.6.2_MDC/src/cons.handler.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/cons.handler.c 2009-03-28 09:10:53.000000000 +0000 @@ -28,7 +28,7 @@ #endif #include -#include +#include "mhl/string.h" #include "global.h" #include "tty.h" diff -urN mc-4.6.2_MDC/src/cons.saver.c mc-2009-03-28/src/cons.saver.c --- mc-4.6.2_MDC/src/cons.saver.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/cons.saver.c 2009-03-28 09:11:43.000000000 +0000 @@ -53,7 +53,7 @@ #endif #include -#include +#include "mhl/string.h" #define LINUX_CONS_SAVER_C #include "cons.saver.h" diff -urN mc-4.6.2_MDC/src/dialog.c mc-2009-03-28/src/dialog.c --- mc-4.6.2_MDC/src/dialog.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/dialog.c 2009-03-28 08:50:21.000000000 +0000 @@ -29,6 +29,7 @@ #include "mouse.h" #include "help.h" /* interactive_display() */ #include "key.h" /* mi_getch() */ +#include "util.h" #include "dialog.h" #include "layout.h" /* winch_flag */ #include "execute.h" /* suspend_cmd() */ diff -urN mc-4.6.2_MDC/src/ext.c mc-2009-03-28/src/ext.c --- mc-4.6.2_MDC/src/ext.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/ext.c 2009-03-28 09:10:19.000000000 +0000 @@ -27,7 +27,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" #include "tty.h" diff -urN mc-4.6.2_MDC/src/file.c mc-2009-03-28/src/file.c --- mc-4.6.2_MDC/src/file.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/file.c 2009-03-28 08:34:47.000000000 +0000 @@ -50,9 +50,12 @@ #include #include -#include -#include -#include +//»#include +//»#include +//»#include +#include "mhl/memory.h" +#include "mhl/escape.h" +#include "mhl/string.h" #include "global.h" #include "tty.h" @@ -76,7 +79,7 @@ #include "filegui.h" #include "tree.h" #include "key.h" -#include "../vfs/vfs-impl.h" +#include "vfs/vfs-impl.h" /* }}} */ diff -urN mc-4.6.2_MDC/src/filenot.c mc-2009-03-28/src/filenot.c --- mc-4.6.2_MDC/src/filenot.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/filenot.c 2009-03-28 09:11:36.000000000 +0000 @@ -27,7 +27,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" diff -urN mc-4.6.2_MDC/src/find.c mc-2009-03-28/src/find.c --- mc-4.6.2_MDC/src/find.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/find.c 2009-03-28 09:12:47.000000000 +0000 @@ -27,7 +27,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" #include "tty.h" @@ -1116,4 +1116,3 @@ } } } - diff -urN mc-4.6.2_MDC/src/global.h mc-2009-03-28/src/global.h --- mc-4.6.2_MDC/src/global.h 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/global.h 2009-03-28 08:34:00.000000000 +0000 @@ -153,7 +153,7 @@ #include "textconf.h" #ifdef USE_VFS -#include "../vfs/vfs.h" +#include "vfs/vfs.h" #else #include "vfsdummy.h" #endif diff -urN mc-4.6.2_MDC/src/hotlist.c mc-2009-03-28/src/hotlist.c --- mc-4.6.2_MDC/src/hotlist.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/hotlist.c 2009-03-28 09:12:35.000000000 +0000 @@ -36,7 +36,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" #include "tty.h" /* COLS */ @@ -72,7 +72,7 @@ #define B_MOVE (B_USER + 7) #ifdef USE_VFS -#include "../vfs/gc.h" +#include "vfs/gc.h" #define B_FREE_ALL_VFS (B_USER + 8) #define B_REFRESH_VFS (B_USER + 9) #endif diff -urN mc-4.6.2_MDC/src/info.c mc-2009-03-28/src/info.c --- mc-4.6.2_MDC/src/info.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/info.c 2009-03-28 08:32:18.000000000 +0000 @@ -268,4 +268,3 @@ return info; } - diff -urN mc-4.6.2_MDC/src/key.c mc-2009-03-28/src/key.c --- mc-4.6.2_MDC/src/key.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/key.c 2009-03-28 08:33:52.000000000 +0000 @@ -43,7 +43,7 @@ #include "cons.saver.h" #ifdef USE_VFS -#include "../vfs/gc.h" +#include "vfs/gc.h" #endif #ifdef HAVE_TEXTMODE_X11_SUPPORT diff -urN mc-4.6.2_MDC/src/main.c mc-2009-03-28/src/main.c --- mc-4.6.2_MDC/src/main.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/main.c 2009-03-28 09:09:59.000000000 +0000 @@ -33,7 +33,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" #include "tty.h" @@ -73,11 +73,11 @@ #include "achown.h" #ifdef WITH_SMBFS -#include "../vfs/smbfs.h" /* smbfs_set_debug() */ +#include "vfs/smbfs.h" /* smbfs_set_debug() */ #endif #ifdef USE_INTERNAL_EDIT -# include "../edit/edit.h" +# include "edit/edit.h" #endif #ifdef HAVE_CHARSET @@ -85,7 +85,7 @@ #endif /* HAVE_CHARSET */ #ifdef USE_VFS -#include "../vfs/gc.h" +#include "vfs/gc.h" #endif #include "popt.h" diff -urN mc-4.6.2_MDC/src/myslang.h mc-2009-03-28/src/myslang.h --- mc-4.6.2_MDC/src/myslang.h 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/myslang.h 2009-03-28 08:35:17.000000000 +0000 @@ -2,7 +2,7 @@ #define MC_MYSLANG_H #ifndef HAVE_SYSTEM_SLANG -# include "../slang/include/slang.h" +# include "slang/include/slang.h" #else #ifdef HAVE_SLANG_SLANG_H # include diff -urN mc-4.6.2_MDC/src/screen.c mc-2009-03-28/src/screen.c --- mc-4.6.2_MDC/src/screen.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/screen.c 2009-03-28 09:10:25.000000000 +0000 @@ -27,7 +27,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" #include "tty.h" diff -urN mc-4.6.2_MDC/src/setup.c mc-2009-03-28/src/setup.c --- mc-4.6.2_MDC/src/setup.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/setup.c 2009-03-28 09:10:38.000000000 +0000 @@ -23,7 +23,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" #include "tty.h" @@ -45,7 +45,7 @@ #include "file.h" /* safe_delete */ #ifdef USE_VFS -#include "../vfs/gc.h" +#include "vfs/gc.h" #endif #ifdef HAVE_CHARSET @@ -53,12 +53,12 @@ #endif #ifdef USE_NETCODE -# include "../vfs/ftpfs.h" -# include "../vfs/fish.h" +# include "vfs/ftpfs.h" +# include "vfs/fish.h" #endif #ifdef USE_INTERNAL_EDIT -# include "../edit/edit.h" +# include "edit/edit.h" #endif diff -urN mc-4.6.2_MDC/src/treestore.c mc-2009-03-28/src/treestore.c --- mc-4.6.2_MDC/src/treestore.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/treestore.c 2009-03-28 09:12:41.000000000 +0000 @@ -41,7 +41,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" #include "treestore.h" diff -urN mc-4.6.2_MDC/src/user.c mc-2009-03-28/src/user.c --- mc-4.6.2_MDC/src/user.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/user.c 2009-03-28 09:12:12.000000000 +0000 @@ -23,7 +23,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" #include "tty.h" @@ -37,8 +37,8 @@ #include "setup.h" #include "history.h" -#include "../edit/edit.h" /* BLOCK_FILE */ -#include "../edit/edit-widget.h" /* WEdit */ +#include "edit/edit.h" /* BLOCK_FILE */ +#include "edit/edit-widget.h" /* WEdit */ /* For the simple listbox manager */ #include "dialog.h" @@ -845,4 +845,3 @@ g_free (entries); g_free (data); } - diff -urN mc-4.6.2_MDC/src/user.h mc-2009-03-28/src/user.h --- mc-4.6.2_MDC/src/user.h 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/user.h 2009-03-28 08:34:08.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef MC_USER_H #define MC_USER_H -#include "../edit/edit-widget.h" +#include "edit/edit-widget.h" void user_menu_cmd (struct WEdit *edit_widget); char *expand_format (struct WEdit *edit_widget, char c, int quote); diff -urN mc-4.6.2_MDC/src/util.c mc-2009-03-28/src/util.c --- mc-4.6.2_MDC/src/util.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/util.c 2009-03-28 09:16:41.000000000 +0000 @@ -34,9 +34,8 @@ #include #include #include - -#include -#include +#include "mhl/escape.h" +#include "mhl/string.h" #include "global.h" #include "profile.h" diff -urN mc-4.6.2_MDC/src/utilunix.c mc-2009-03-28/src/utilunix.c --- mc-4.6.2_MDC/src/utilunix.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/utilunix.c 2009-03-28 09:12:05.000000000 +0000 @@ -41,7 +41,7 @@ #endif #include -#include +#include "mhl/string.h" #include "global.h" #include "execute.h" diff -urN mc-4.6.2_MDC/src/widget.c mc-2009-03-28/src/widget.c --- mc-4.6.2_MDC/src/widget.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/widget.c 2009-03-28 09:10:09.000000000 +0000 @@ -34,7 +34,7 @@ #include #include -#include +#include "mhl/string.h" #include "global.h" #include "tty.h" diff -urN mc-4.6.2_MDC/src/x11conn.c mc-2009-03-28/src/x11conn.c --- mc-4.6.2_MDC/src/x11conn.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/src/x11conn.c 2009-03-28 08:33:33.000000000 +0000 @@ -38,7 +38,7 @@ #include -#include "../src/global.h" +#include "src/global.h" #ifdef HAVE_GMODULE # include diff -urN mc-4.6.2_MDC/vfs/cpio.c mc-2009-03-28/vfs/cpio.c --- mc-4.6.2_MDC/vfs/cpio.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/cpio.c 2009-03-28 08:38:28.000000000 +0000 @@ -21,15 +21,15 @@ #include #include -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs-impl.h" #include "gc.h" /* vfs_rmstamp */ #include "xdirentry.h" -#include "../src/unixcompat.h" +#include "src/unixcompat.h" enum { STATUS_START, diff -urN mc-4.6.2_MDC/vfs/direntry.c mc-2009-03-28/vfs/direntry.c --- mc-4.6.2_MDC/vfs/direntry.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/direntry.c 2009-03-28 08:38:37.000000000 +0000 @@ -27,10 +27,10 @@ #include #include -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs-impl.h" #include "gc.h" /* vfs_rmstamp */ diff -urN mc-4.6.2_MDC/vfs/extfs.c mc-2009-03-28/vfs/extfs.c --- mc-4.6.2_MDC/vfs/extfs.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/extfs.c 2009-03-28 09:13:03.000000000 +0000 @@ -36,14 +36,14 @@ #endif #include -#include +#include "mhl/string.h" -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" -#include "../src/execute.h" /* For shell_execute */ +#include "src/execute.h" /* For shell_execute */ #include "vfs.h" #include "vfs-impl.h" #include "gc.h" /* vfs_rmstamp */ diff -urN mc-4.6.2_MDC/vfs/fish.c mc-2009-03-28/vfs/fish.c --- mc-4.6.2_MDC/vfs/fish.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/fish.c 2009-03-28 09:14:18.000000000 +0000 @@ -38,21 +38,21 @@ #include #include -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "xdirentry.h" #include "vfs.h" #include "vfs-impl.h" #include "gc.h" /* vfs_stamp_create */ #include "tcputil.h" -#include "../src/unixcompat.h" +#include "src/unixcompat.h" #include "fish.h" -#include "../mhl/memory.h" -#include "../mhl/string.h" -#include "../mhl/escape.h" +#include "mhl/memory.h" +#include "mhl/string.h" +#include "mhl/escape.h" int fish_directory_timeout = 900; diff -urN mc-4.6.2_MDC/vfs/ftpfs.c mc-2009-03-28/vfs/ftpfs.c --- mc-4.6.2_MDC/vfs/ftpfs.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/ftpfs.c 2009-03-28 09:12:55.000000000 +0000 @@ -69,20 +69,20 @@ #include #include -#include +#include "mhl/string.h" -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../src/history.h" +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "src/history.h" #include "utilvfs.h" #include "xdirentry.h" #include "vfs.h" #include "vfs-impl.h" #include "gc.h" /* vfs_stamp_create */ #include "tcputil.h" -#include "../src/setup.h" /* for load_anon_passwd */ +#include "src/setup.h" /* for load_anon_passwd */ #include "ftpfs.h" #ifndef MAXHOSTNAMELEN # define MAXHOSTNAMELEN 64 diff -urN mc-4.6.2_MDC/vfs/gc.c mc-2009-03-28/vfs/gc.c --- mc-4.6.2_MDC/vfs/gc.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/gc.c 2009-03-28 09:13:27.000000000 +0000 @@ -31,19 +31,19 @@ #include #include /* is_digit() */ -#include +#include "mhl/string.h" -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs-impl.h" #include "gc.h" #include "vfs.h" -#include "../src/panel.h" /* get_current_panel() */ -#include "../src/layout.h" /* get_current_type() */ +#include "src/panel.h" /* get_current_panel() */ +#include "src/layout.h" /* get_current_type() */ int vfs_timeout = 60; /* VFS timeout in seconds */ diff -urN mc-4.6.2_MDC/vfs/local.c mc-2009-03-28/vfs/local.c --- mc-4.6.2_MDC/vfs/local.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/local.c 2009-03-28 08:36:43.000000000 +0000 @@ -6,10 +6,10 @@ #include -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" #include "local.h" diff -urN mc-4.6.2_MDC/vfs/mcfs.c mc-2009-03-28/vfs/mcfs.c --- mc-4.6.2_MDC/vfs/mcfs.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/mcfs.c 2009-03-28 08:37:52.000000000 +0000 @@ -49,10 +49,10 @@ #endif #endif -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" #include "vfs-impl.h" diff -urN mc-4.6.2_MDC/vfs/mcfsutil.c mc-2009-03-28/vfs/mcfsutil.c --- mc-4.6.2_MDC/vfs/mcfsutil.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/mcfsutil.c 2009-03-28 08:37:35.000000000 +0000 @@ -43,10 +43,10 @@ #include -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "mcfsutil.h" #include "tcputil.h" diff -urN mc-4.6.2_MDC/vfs/mcserv.c mc-2009-03-28/vfs/mcserv.c --- mc-4.6.2_MDC/vfs/mcserv.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/mcserv.c 2009-03-28 08:37:16.000000000 +0000 @@ -109,11 +109,11 @@ * a native printf(3) capable of all POSIX features. */ #undef ENABLE_NLS -#include "../src/global.h" +#include "src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" #include "mcfs.h" diff -urN mc-4.6.2_MDC/vfs/sfs.c mc-2009-03-28/vfs/sfs.c --- mc-4.6.2_MDC/vfs/sfs.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/sfs.c 2009-03-28 09:13:16.000000000 +0000 @@ -34,18 +34,18 @@ #include #include -#include +#include "mhl/string.h" -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" #include "vfs-impl.h" #include "gc.h" /* vfs_stamp_create */ #include "local.h" -#include "../src/execute.h" /* EXECUTE_AS_SHELL */ +#include "src/execute.h" /* EXECUTE_AS_SHELL */ struct cachedfile { char *name, *cache; diff -urN mc-4.6.2_MDC/vfs/smbfs.c mc-2009-03-28/vfs/smbfs.c --- mc-4.6.2_MDC/vfs/smbfs.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/smbfs.c 2009-03-28 09:13:09.000000000 +0000 @@ -49,7 +49,7 @@ #include -#include +#include "mhl/string.h" #include "vfs.h" #include "vfs-impl.h" diff -urN mc-4.6.2_MDC/vfs/tar.c mc-2009-03-28/vfs/tar.c --- mc-4.6.2_MDC/vfs/tar.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/tar.c 2009-03-28 08:36:54.000000000 +0000 @@ -31,10 +31,10 @@ #include #endif -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "gc.h" /* vfs_rmstamp */ #include "xdirentry.h" diff -urN mc-4.6.2_MDC/vfs/undelfs.c mc-2009-03-28/vfs/undelfs.c --- mc-4.6.2_MDC/vfs/undelfs.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/undelfs.c 2009-03-28 08:38:45.000000000 +0000 @@ -51,10 +51,10 @@ #include #include -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" #include "vfs-impl.h" diff -urN mc-4.6.2_MDC/vfs/utilvfs.c mc-2009-03-28/vfs/utilvfs.c --- mc-4.6.2_MDC/vfs/utilvfs.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/utilvfs.c 2009-03-28 08:36:32.000000000 +0000 @@ -21,14 +21,14 @@ #include #include -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" -#include "../src/unixcompat.h" -#include "../src/history.h" +#include "src/unixcompat.h" +#include "src/history.h" /* Extract the hostname and username from the path */ /* path is in the form: [user@]hostname:port/remote-dir, e.g.: diff -urN mc-4.6.2_MDC/vfs/vfs.c mc-2009-03-28/vfs/vfs.c --- mc-4.6.2_MDC/vfs/vfs.c 2009-02-01 19:30:21.000000000 +0000 +++ mc-2009-03-28/vfs/vfs.c 2009-03-28 09:13:21.000000000 +0000 @@ -38,12 +38,12 @@ #include #include /* is_digit() */ -#include +#include "mhl/string.h" -#include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/tty.h" /* enable/disable interrupt key */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "gc.h"