Ticket #3861: fix %f macro in mcedit user menu.

Initial step: move usermenu.[ch] files from src/filemanager/ directory
to src/ one.

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

src/Makefile.am

@@ -78,6 +78,7 @@ libinternal_la_SOURCES = \
 	learn.c learn.h \
 	setup.c setup.h \
 	textconf.c textconf.h \
+	usermenu.c usermenu.h \
 	util.c util.h
 
 if CHARSET

src/editor/edit.c

@@ -61,7 +61,7 @@
 #include "lib/charsets.h"       /* get_codepage_id */
 #endif
 
-#include "src/filemanager/usermenu.h"   /* user_menu_cmd() */
+#include "src/usermenu.h"       /* user_menu_cmd() */
 
 #include "src/setup.h"          /* option_tab_spacing */
 #include "src/learn.h"          /* learn_keys */

src/filemanager/Makefile.am

@@ -24,8 +24,7 @@ libmcfilemanager_la_SOURCES = \
 	panelize.c panelize.h \
 	panel.c panel.h \
 	tree.c tree.h \
-	treestore.c treestore.h \
-	usermenu.c usermenu.h
+	treestore.c treestore.h
 
 # Unmaintained, unsupported, etc
 #	listmode.c listmode.h

src/filemanager/cmd.c

@@ -63,12 +63,14 @@
 #include "lib/keybind.h"        /* CK_Down, CK_History */
 #include "lib/event.h"          /* mc_event_raise() */
 
-#include "src/viewer/mcviewer.h"
 #include "src/setup.h"
 #include "src/execute.h"        /* toggle_panels() */
 #include "src/history.h"
+#include "src/usermenu.h"       /* MC_GLOBAL_MENU */
 #include "src/util.h"           /* check_for_default() */
 
+#include "src/viewer/mcviewer.h"
+
 #ifdef USE_INTERNAL_EDIT
 #include "src/editor/edit.h"
 #endif
@@ -85,7 +87,6 @@
 #include "panel.h"              /* WPanel */
 #include "tree.h"               /* tree_chdir() */
 #include "midnight.h"           /* change_panel() */
-#include "usermenu.h"           /* MC_GLOBAL_MENU */
 #include "command.h"            /* cmdline */
 #include "layout.h"             /* get_current_type() */
 #include "ext.h"                /* regex_command() */

src/filemanager/command.c

@@ -49,10 +49,10 @@
 #include "src/subshell/subshell.h"
 #endif
 #include "src/execute.h"        /* shell_execute */
+#include "src/usermenu.h"       /* expand_format */
 
 #include "midnight.h"           /* current_panel */
 #include "layout.h"             /* for command_prompt variable */
-#include "usermenu.h"           /* expand_format */
 #include "tree.h"               /* sync_tree() */
 
 #include "command.h"

src/filemanager/ext.c

@@ -53,6 +53,7 @@
 #include "src/setup.h"          /* use_file_to_check_type */
 #include "src/execute.h"
 #include "src/history.h"
+#include "src/usermenu.h"
 
 #include "src/consaver/cons.saver.h"
 #include "src/viewer/mcviewer.h"
@@ -62,7 +63,6 @@
 #endif
 
 #include "panel.h"              /* do_cd */
-#include "usermenu.h"
 
 #include "ext.h"
 

src/filemanager/panel.c

@@ -65,6 +65,8 @@
 #include "src/subshell/subshell.h"      /* do_subshell_chdir() */
 #endif
 
+#include "src/usermenu.h"
+
 #include "dir.h"
 #include "boxes.h"
 #include "tree.h"
@@ -72,7 +74,6 @@
 #include "layout.h"             /* Most layout variables are here */
 #include "cmd.h"
 #include "command.h"            /* cmdline */
-#include "usermenu.h"
 #include "midnight.h"
 #include "mountlist.h"          /* my_statfs */
 

src/usermenu.c

@@ -53,9 +53,9 @@
 #include "src/setup.h"
 #include "src/history.h"
 
-#include "dir.h"
-#include "midnight.h"
-#include "layout.h"
+#include "src/filemanager/dir.h"
+#include "src/filemanager/midnight.h"
+#include "src/filemanager/layout.h"
 
 #include "usermenu.h"