From c43bb6f576e2a2f08edb81b0f0e32d615f0aad68 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Tue, 4 Aug 2009 14:28:09 +0400
Subject: [PATCH] TTY: moved alternate_plus_minus variable to TTY layer.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 src/learn.c   | 1 -
 src/main.c    | 4 ----
 src/main.h    | 1 -
 src/tty/key.c | 4 ++++
 src/tty/key.h | 1 +
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/learn.c b/src/learn.c
index 0066f7f9b..23df9d30f 100644
--- a/src/learn.c
+++ b/src/learn.c
@@ -43,7 +43,6 @@
 #include "widget.h"
 #include "../src/mcconfig/mcconfig.h"	/* Save profile */
 #include "setup.h"
-#include "main.h"			/* alternate_plus_minus */
 #include "layout.h"			/* repaint_screen() */
 #include "learn.h"
 #include "wtools.h"
diff --git a/src/main.c b/src/main.c
index 50d3abf22..a562a6f71 100644
--- a/src/main.c
+++ b/src/main.c
@@ -139,10 +139,6 @@ int mark_moves_down = 1;
 /* If true, at startup the user-menu is invoked */
 int auto_menu = 0;
 
-/* If true, use + and \ keys normally and select/unselect do if M-+ / M-\
-   and M-- and keypad + / - */
-int alternate_plus_minus = 0;
-
 /* If true, then the +, - and \ keys have their special meaning only if the
  * command line is emtpy, otherwise they behave like regular letters
  */
diff --git a/src/main.h b/src/main.h
index 39f6fec61..c2f9bbcfb 100644
--- a/src/main.h
+++ b/src/main.h
@@ -64,7 +64,6 @@ extern int confirm_overwrite;
 extern int boot_current_is_left;
 extern int use_file_to_check_type;
 extern int vfs_use_limit;
-extern int alternate_plus_minus;
 extern int only_leading_plus_minus;
 extern int output_starts_shell;
 extern int midnight_shutdown;
diff --git a/src/tty/key.c b/src/tty/key.c
index ed97b1dcc..456582a36 100644
--- a/src/tty/key.c
+++ b/src/tty/key.c
@@ -80,6 +80,10 @@
 
 /*** global variables **************************************************/
 
+/* If true, use + and \ keys normally and select/unselect do if M-+ / M-\.
+   and M-- and keypad + / - */
+int alternate_plus_minus = 0;
+
 int mou_auto_repeat = 100;
 int double_click_speed = 250;
 int old_esc_mode = 0;
diff --git a/src/tty/key.h b/src/tty/key.h
index fb2f4d3e7..2090f9abc 100644
--- a/src/tty/key.h
+++ b/src/tty/key.h
@@ -52,6 +52,7 @@ int tty_getch (void);
 #define KEY_M_CTRL  0x4000
 #define KEY_M_MASK  0x7000
 
+extern int alternate_plus_minus;
 extern int double_click_speed;
 extern int old_esc_mode;
 extern int use_8th_bit_as_meta;