From 0e6addcb9646ea2e9f60659e5281567fdc3a0e1a Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 1 Jan 2013 19:38:33 +0400 Subject: [PATCH] Ticket #2944: code cleanup before 4.8.8 release. (mc_prompt): move from src/setup.[ch] to src/filemanager/midnight.[ch]. Signed-off-by: Andrew Borodin --- src/filemanager/midnight.c | 3 +++ src/filemanager/midnight.h | 2 ++ src/setup.c | 3 --- src/setup.h | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c index a7073813e..7d1f2a26b 100644 --- a/src/filemanager/midnight.c +++ b/src/filemanager/midnight.c @@ -115,6 +115,9 @@ WLabel *the_hint; /* The button bar */ WButtonBar *the_bar; +/* The prompt */ +const char *mc_prompt = NULL; + /*** file scope macro definitions ****************************************************************/ #ifdef HAVE_CHARSET diff --git a/src/filemanager/midnight.h b/src/filemanager/midnight.h index adb1ebe86..9828479bf 100644 --- a/src/filemanager/midnight.h +++ b/src/filemanager/midnight.h @@ -37,6 +37,8 @@ extern WPanel *left_panel; extern WPanel *right_panel; extern WPanel *current_panel; +extern const char *mc_prompt; + /*** declarations of public functions ************************************************************/ void update_menu (void); diff --git a/src/setup.c b/src/setup.c index 69e5823b1..3ac68af02 100644 --- a/src/setup.c +++ b/src/setup.c @@ -200,9 +200,6 @@ int quit = 0; /* The user's shell */ char *shell = NULL; -/* The prompt */ -const char *mc_prompt = NULL; - /* Set to TRUE to suppress printing the last directory */ int print_last_revert = FALSE; diff --git a/src/setup.h b/src/setup.h index a4a4c1600..21e8592c6 100644 --- a/src/setup.h +++ b/src/setup.h @@ -125,7 +125,6 @@ extern int quit; extern gboolean print_last_revert; extern char *shell; -extern const char *mc_prompt; /* index to record_macro_buf[], -1 if not recording a macro */ extern int macro_index; -- 2.11.4.GIT