From f13778d94fe48e8995ed92fca5df75fb16e6d096 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Mon, 9 Aug 2010 10:58:52 +0400
Subject: [PATCH] torben_fj_mode options was moved from [Midnight-Commander]
 section to [Panels] one.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 src/filemanager/panel.c | 12 ++++++------
 src/filemanager/panel.h |  1 -
 src/setup.c             |  5 +++--
 src/setup.h             |  1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c
index 5b9234295..a8643c0bc 100644
--- a/src/filemanager/panel.c
+++ b/src/filemanager/panel.c
@@ -73,9 +73,6 @@
 /* If true, show the mini-info on the panel */
 int show_mini_info = 1;
 
-/* If true, use some usability hacks by Torben */
-int torben_fj_mode = 0;
-
 /* The hook list for the select file function */
 hook_t *select_file_hook = NULL;
 
@@ -1956,9 +1953,10 @@ move_home (WPanel * panel)
 {
     if (panel->selected == 0)
         return;
+
     unselect_item (panel);
 
-    if (torben_fj_mode)
+    if (panels_options.torben_fj_mode)
     {
         int middle_pos = panel->top_file + (ITEMS (panel) / 2);
 
@@ -1988,8 +1986,10 @@ move_end (WPanel * panel)
 {
     if (panel->selected == panel->count - 1)
         return;
+
     unselect_item (panel);
-    if (torben_fj_mode)
+
+    if (panels_options.torben_fj_mode)
     {
         int middle_pos = panel->top_file + (ITEMS (panel) / 2);
 
@@ -2870,7 +2870,7 @@ panel_key (WPanel * panel, int key)
         if (key == panel_map[i].key)
             return panel_execute_cmd (panel, panel_map[i].command);
 
-    if (torben_fj_mode && key == ALT ('h'))
+    if (panels_options.torben_fj_mode && key == ALT ('h'))
     {
         goto_middle_file (panel);
         return MSG_HANDLED;
diff --git a/src/filemanager/panel.h b/src/filemanager/panel.h
index 58fd47b3e..0ae8025f6 100644
--- a/src/filemanager/panel.h
+++ b/src/filemanager/panel.h
@@ -133,7 +133,6 @@ typedef struct WPanel
 
 extern panel_field_t panel_fields[];
 
-extern int torben_fj_mode;
 extern int show_mini_info;
 
 extern hook_t *select_file_hook;
diff --git a/src/setup.c b/src/setup.c
index 0c81dc6cd..932f7b8d6 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -143,7 +143,8 @@ panels_options_t panels_options = {
     .mouse_move_pages = TRUE,
     .filetype_mode = TRUE,
     .permission_mode = FALSE,
-    .qsearch_mode = QSEARCH_PANEL_CASE
+    .qsearch_mode = QSEARCH_PANEL_CASE,
+    .torben_fj_mode = FALSE
 };
 
 int easy_patterns = 1;
@@ -273,7 +274,6 @@ static const struct
     { "cd_symlinks", &cd_symlinks },
     { "show_all_if_ambiguous", &show_all_if_ambiguous },
     { "max_dirt_limit", &mcview_max_dirt_limit },
-    { "torben_fj_mode", &torben_fj_mode },
     { "use_file_to_guess_type", &use_file_to_check_type },
     { "alternate_plus_minus", &alternate_plus_minus },
     { "only_leading_plus_minus", &only_leading_plus_minus },
@@ -363,6 +363,7 @@ static const struct
     { "mouse_move_pages",  &panels_options.mouse_move_pages },
     { "filetype_mode", &panels_options.filetype_mode },
     { "permission_mode", &panels_options.permission_mode },
+    { "torben_fj_mode", &panels_options.torben_fj_mode },
     { NULL, NULL }
 };
 /* *INDENT-ON* */
diff --git a/src/setup.h b/src/setup.h
index d7e17bce8..44e15e0e3 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -48,6 +48,7 @@ typedef struct
     gboolean filetype_mode;     /* If TRUE then add per file type hilighting */
     gboolean permission_mode;   /* If TRUE, we use permission hilighting */
     qsearch_mode_t qsearch_mode;        /* Quick search mode */
+    gboolean torben_fj_mode;            /* If TRUE, use some usability hacks by Torben */
 } panels_options_t;
 
 /*** global variables defined in .c file *********************************************************/